Merge pull request #3146 from Imperadeiro98/my-branch

Updates to i18n
This commit is contained in:
Imperadeiro98 2015-10-29 16:01:21 +00:00
commit 1e18c7f131
3 changed files with 23 additions and 18 deletions

View file

@ -602,6 +602,8 @@
jose_blurb: "Taking Off"
retrostyle_title: "Illustration"
retrostyle_blurb: "RetroStyle Games"
rob_title: "Compiler Engineer"
rob_blurb: "Codes things and stuff"
teachers:
more_info: "More Info for Teachers"
@ -1277,6 +1279,9 @@
quantity: "Quantity"
redeemed: "Redeemed"
no_codes: "No codes yet!"
you_can1: "You can"
you_can2: "purchase a prepaid code"
you_can3: "that can be applied to your own account or given to others."
loading_error:
could_not_load: "Error loading from server"

View file

@ -10,7 +10,7 @@ block content
h2(data-i18n="about.why_codecombat")
| Why CodeCombat?
p(data-i18n="about.why_paragraph_1")
| If you want to learn to program, you don't need lessons.
| You need to write a lot of code and have a great time doing it.
@ -60,13 +60,13 @@ block content
a(href='mailto:team@codecombat.com') team@codecombat.com
ul.col-sm-6.team-column
ul.thumbnails
li.row
h2(data-i18n="about.team") Team
a(href="http://www.nickwinter.net")
img(src="/images/pages/about/nick_small.png").img-thumbnail
.team_bio
@ -76,7 +76,7 @@ block content
| Cofounder
p(data-i18n="about.nick_blurb")
| Motivation Guru
a(href="http://www.mattlott.com/")
img(src="/images/pages/about/matt_small.png").img-thumbnail
.team_bio
@ -98,7 +98,7 @@ block content
| Cofounder
p(data-i18n="about.george_blurb")
| Businesser
a(href="http://cat.zdh.com/")
img(src="/images/pages/about/cat_small.png").img-thumbnail
.team_bio
@ -118,7 +118,7 @@ block content
| Cofounder
p(data-i18n="about.scott_blurb")
| Reasonable one
a(href="http://michaelschmatz.com")
img(src="/images/pages/about/michael_small.png").img-thumbnail
.team_bio
@ -128,7 +128,7 @@ block content
| Programmer
p(data-i18n="about.michael_blurb")
| Sys Admin
li.row
a(href="http://floor.is/lava/")
@ -140,7 +140,7 @@ block content
| Game Designer
p(data-i18n="about.josh_blurb")
| Floor Is Lava
a(href="https://soundcloud.com/taking-off")
img(src="/images/pages/about/jose_small.png").img-thumbnail
.team_bio
@ -152,7 +152,7 @@ block content
| Taking Off
li.row
a(href="http://retrostylegames.com/")
img(src="/images/pages/about/pavel_small.png").img-thumbnail
.team_bio
@ -174,7 +174,7 @@ block content
| RetroStyle Games
li.row
a(href="http://basicer.com/")
img(src="/images/pages/about/rob_small.png").img-thumbnail
.team_bio
@ -183,4 +183,4 @@ block content
p(data-i18n="about.rob_title")
| Compiler Engineer
p(data-i18n="about.rob_blurb")
| Codes things and stuff.
| Codes things and stuff

View file

@ -77,7 +77,7 @@ block content
table.table.table-striped.table-condensed
tr
th(data-i18n="user.status") Status
th(data-i18n="user.status")
td
if view.personalSub.subscribed
strong(data-i18n="account.subscribed")
@ -122,12 +122,12 @@ block content
// - Prepaid Codes
.panel.panel-default
.panel-heading
h3 Prepaid Codes
h3(data-i18n="account.prepaid_codes")
.panel-body
p
span.spr You can
a(href="/account/prepaid") purchase a prepaid code
span.spl that can be applied to your own account or given to others.
span.spr(data-i18n="account_prepaid.you_can1")
a(href="/account/prepaid", data-i18n="account_prepaid.you_can2")
span.spl(data-i18n="account_prepaid.you_can3")
//- Sponsored Subscriptions
.panel.panel-default
@ -204,5 +204,5 @@ block content
if recipient.cancel_at_period_end
div Ends #{moment(recipient.cancel_at_period_end).format('l')}
else
button.recipient-unsubscribe-button.btn.btn-sm.btn-warning Unsubscribe
button.recipient-unsubscribe-button.btn.btn-sm.btn-warning(data-i18n="subscribe.unsubscribe")
button.confirm-recipient-unsubscribe-button.btn.btn-sm.btn-primary.hide(data-i18n="play.confirm")