codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-17 08:50:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3132 from Imperadeiro98/i18n-updates

Browse source 
Updated i18n across some files
This commit is contained in:
Nick Winter 2015-10-28 06:41:35 -07:00
commit a970f322f9
4 changed files with 61 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/locale/en.coffee
View file

@ -604,7 +604,7 @@
retrostyle_blurb: "RetroStyle Games"
teachers:
title: "CodeCombat: Info for Teachers"
more_info: "More Info for Teachers"
intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
intro_2: "No experience required!"
free_title: "How much does it cost?"
@ -840,6 +840,19 @@
playtime: "Playtime"
last_played: "Last played"
leagues_explanation: "Play in a league against other clan members in these multiplayer arena instances."
track_concepts1: "Track concepts"
track_concepts2a: "learned by each student"
track_concepts2b: "learned by each member"
track_concepts3a: "Track levels completed for each student"
track_concepts3b: "Track levels completed for each member"
track_concepts4a: "See your students'"
track_concepts4b: "See your members'"
track_concepts5: "solutions"
track_concepts6a: "Sort students by name or progress"
track_concepts6b: "Sort members by name or progress"
track_concepts7: "Requires invitation"
track_concepts8: "to join"
private_require_sub: "Private clans require a subscription to create or join."
courses:
course: "Course"
@ -1215,7 +1228,6 @@
recently_played: "Recently Played"
no_recent_games: "No games played during the past two weeks."
payments: "Payments"
prepaid: "Prepaid"
prepaid_codes: "Prepaid Codes"
purchased: "Purchased"
sale: "Sale"
@ -1249,11 +1261,22 @@
account_prepaid:
purchase_code: "Purchase a Subscription Code"
purchase_amount: "Amount"
purchase_code1: "Subscription Codes can be redeemed to add premium subscription time to one or more CodeCombat accounts."
purchase_code2: "Each CodeCombat account can only redeem a particular Subscription Code once."
purchase_code3: "Subscription Code months will be added to the end of any existing subscription on the account."
users: "Users"
months: "Months"
purchase_total: "Total"
purchase_button: "Submit Purchase"
your_codes: "Your Codes:"
your_codes: "Your Codes" # {change}
redeem_codes: "Redeem a Subscription Code"
prepaid_code: "Prepaid Code"
lookup_code: "Lookup prepaid code"
apply_account: "Apply to your account"
copy_link: "You can copy the code's link and send it to someone."
quantity: "Quantity"
redeemed: "Redeemed"
no_codes: "No codes yet!"
loading_error:
could_not_load: "Error loading from server"

33
app/templates/account/prepaid-view.jade
View file

@ -12,7 +12,7 @@ block content
span.glyphicon.glyphicon-home
li
a(href="/account", data-i18n="nav.account")
li.active(data-i18n="account.prepaid")
li.active(data-i18n="account.prepaid_codes")
.row
.col-md-12
@ -23,16 +23,16 @@ block content
span(data-i18n="account_prepaid.purchase_code")
.panel-collapse.collapse(class=ppcQuery ? "": "in")#purchasepanel
.panel-body
p Subscription Codes can be redeemed to add premium subscription time to one or more Code Combat accounts.
p Each Code Combat account can only redeem a particular Subscription Code once.
p Subscription Code months will be added to the end of any existing subscription on the account.
p(data-i18n="account_prepaid.purchase_code1")
p(data-i18n="account_prepaid.purchase_code2")
p(data-i18n="account_prepaid.purchase_code3")
.form-horizontal
.form-group
label.control-label.col-md-2(for="users") Users
label.control-label.col-md-2(for="users", data-i18n="account_prepaid.users")
.col-md-2
input#users-input.form-control(name="users", type="number", value="#{purchase.users}", min=1)
.form-group
label.control-label.col-md-2(for="months") Months
label.control-label.col-md-2(for="months", data-i18n="account_prepaid.months")
.col-md-2
input#months-input.form-control(name="months", type="number", value="#{purchase.months}", min=1)
.form-group
@ -51,7 +51,8 @@ block content
.panel-collapse.collapse.in#redeempanel
.panel-body
p
span.spr Prepaid Code:
span(data-i18n="account_prepaid.prepaid_code")
span.spr :
input.input-ppc(name="ppc", type="text", value="#{ppc}", required)
if ppcInfo && ppcInfo.length > 0
p
@ -60,9 +61,9 @@ block content
!= info
p
span.spr
button#lookup-code-btn.btn.btn-info Lookup prepaid code
button#lookup-code-btn.btn.btn-info(data-i18n="account_prepaid.lookup_code")
span
button#redeem-code-btn.btn.btn-success Apply to your account
button#redeem-code-btn.btn.btn-success(data-i18n="account_prepaid.apply_account")
.row
.col-md-12
.panel.panel-default
@ -76,11 +77,11 @@ block content
table.table.table-striped
tr
th
span(title="You can copy the code's link and send it to someone.") Code
span.spr(data-i18n="[title]account_prepaid.copy_link;general.code", title="You can copy the code's link and send it to someone.")
span.glyphicon.glyphicon-question-sign(aria-hidden="true")
th Months
th Quantity
th Status
th(data-i18n="account_prepaid.months")
th(data-i18n="account_prepaid.quantity")
th(data-i18n="user.status")
for code in codes.models
if code.get('type') === 'terminal_subscription'
- var owner = (code.get('creator') == me.id ? true : false)
@ -99,8 +100,8 @@ block content
else
td -
if owner
td Purchased
td(data-i18n="account.purchased")
else
td Redeemed
td(data-i18n="account_prepaid.redeemed")
else
p No codes yet!
p(data-i18n="account_prepaid.no_codes")

20
app/templates/teachers.jade
View file

@ -22,7 +22,7 @@ block content
a(href='mailto:team@codecombat.com') team@codecombat.com
br
h2 More Info for Teachers
h2(data-i18n="teachers.more_info")
p(data-i18n="teachers.intro_1")
p(data-i18n="teachers.intro_2")
@ -67,23 +67,23 @@ block content
h4(data-i18n="teachers.sub_includes_7")
ul
li
strong Track concepts
span.spl learned by each student
li Track levels completed for each student
strong(data-i18n="clans.track_concepts1")
span.spl(data-i18n="clans.track_concepts2a")
li(data-i18n="clans.track_concepts3a")
li
span See your students'
strong.spl solutions
li Sort students by name or progress
span(data-i18n="clans.track_concepts4a")
strong.spl(data-i18n="clans.track_concepts5")
li(data-i18n="clans.track_concepts6a")
li
strong Requires invitation
span.spl to join
strong(data-i18n="clans.track_concepts7")
span.spl(data-i18n="clans.track_concepts8")
p
img(src='/images/pages/clans/dashboard_preview.png' height='400')
p
span.spr(data-i18n="teachers.private_clans_2")
a(href='/clans', data-i18n="clans.clan")
span(data-i18n="teachers.private_clans_3")
p Private clans require a subscription to create or join.
p(data-i18n="clans.private_require_sub")
h3(data-i18n="teachers.material_title")
if me.isOnPremiumServer()

14
app/views/clans/ClansView.coffee
View file

@ -72,16 +72,16 @@ module.exports = class ClansView extends RootView
@supermodel.addRequestResource('user_names', options, 0).load()
setupPrivateInfoPopover: ->
popoverTitle = "<h3>Private Clans</h3>"
popoverTitle = "<h3>" + $.i18n.t('teachers.sub_includes_7') + "</h3>"
popoverContent = "<ul>"
popoverContent += "<li><span style='font-weight:bold;'>Track concepts</span> learned by each member"
popoverContent += "<li>Track levels completed for each member"
popoverContent += "<li>See your members' <span style='font-weight:bold;'>solutions</span>"
popoverContent += "<li>Sort members by name or progress"
popoverContent += "<li><span style='font-weight:bold;'>Requires invitation</span> to join"
popoverContent += "<li><span style='font-weight:bold;'>" + $.i18n.t('clans.track_concepts1') + "</span> " + $.i18n.t('clans.track_concepts2b')
popoverContent += "<li>" + $.i18n.t('clans.track_concepts3b')
popoverContent += "<li>" + $.i18n.t('clans.track_concepts4b') + " <span style='font-weight:bold;'>" + $.i18n.t('clans.track_concepts5') + "</span>"
popoverContent += "<li>" + $.i18n.t('clans.track_concepts6b')
popoverContent += "<li><span style='font-weight:bold;'>" + $.i18n.t('clans.track_concepts7') + "</span> " + $.i18n.t('clans.track_concepts8')
popoverContent += "</ul>"
popoverContent += "<p><img src='/images/pages/clans/dashboard_preview.png' height='400'></p>"
popoverContent += "<p>Private clans require a subscription to create or join.</p>"
popoverContent += "<p>" + $.i18n.t('clans.private_require_sub') + "</p>"
@$el.find('.private-more-info').popover(
animation: true
html: true