diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 04e41671f..19bef031c 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -159,6 +159,9 @@
accepted: "Accepted"
rejected: "Rejected"
withdrawn: "Withdrawn"
+ accept: "Accept"
+ reject: "Reject"
+ withdraw: "Withdraw"
submitter: "Submitter"
submitted: "Submitted"
commit_msg: "Commit Message"
@@ -214,6 +217,8 @@
play_level:
done: "Done"
+ next_game: "Next game"
+ show_menu: "Show game menu"
home: "Home" # Not used any more, will be removed soon.
level: "Level" # Like "Level: Dungeons of Kithgard"
skip: "Skip"
@@ -1115,6 +1120,7 @@
simulate_games: "Simulate Games!"
games_simulated_by: "Games simulated by you:"
games_simulated_for: "Games simulated for you:"
+ games_in_queue: "Games currently in the queue:"
games_simulated: "Games simulated"
games_played: "Games played"
ratio: "Ratio"
@@ -1151,6 +1157,7 @@
fight: "Fight!"
watch_victory: "Watch your victory"
defeat_the: "Defeat the"
+ watch_battle: "Watch the battle"
tournament_started: ", started"
tournament_ends: "Tournament ends"
tournament_ended: "Tournament ended"
@@ -1208,6 +1215,7 @@
no_recent_games: "No games played during the past two weeks."
payments: "Payments"
prepaid: "Prepaid"
+ prepaid_codes: "Prepaid Codes"
purchased: "Purchased"
sale: "Sale"
subscription: "Subscription"
diff --git a/app/templates/account/main-account-view.jade b/app/templates/account/main-account-view.jade
index 3f998f9ac..f071999ea 100644
--- a/app/templates/account/main-account-view.jade
+++ b/app/templates/account/main-account-view.jade
@@ -24,5 +24,4 @@ block content
li.list-group-item
a.btn.btn-lg.btn-primary(href="/account/subscription", data-i18n="account.subscription")
li.list-group-item
- a.btn.btn-lg.btn-primary(href="/account/prepaid") Prepaid Codes
-
+ a.btn.btn-lg.btn-primary(href="/account/prepaid", data-i18n="account.prepaid_codes") Prepaid Codes
diff --git a/app/templates/courses/course-enroll.jade b/app/templates/courses/course-enroll.jade
index 5806b63e7..5bd657a4d 100644
--- a/app/templates/courses/course-enroll.jade
+++ b/app/templates/courses/course-enroll.jade
@@ -90,5 +90,5 @@ mixin trial-and-questions
h3(data-i18n="courses.questions")
p
- span(data-i18n="teachers_survey.contact_1")
- a.spl(href='mailto:team@codecombat.com') team@codecombat.com
+ span.spr(data-i18n="teachers_survey.contact_1")
+ a(href='mailto:team@codecombat.com') team@codecombat.com
diff --git a/app/templates/editor/patch_modal.jade b/app/templates/editor/patch_modal.jade
index a1534b071..9f44b9d26 100644
--- a/app/templates/editor/patch_modal.jade
+++ b/app/templates/editor/patch_modal.jade
@@ -12,16 +12,14 @@ block modal-body-content
else
.alert.alert-danger Could not apply this delta to the current version.
-
block modal-footer
.modal-footer
button(data-dismiss="modal", data-i18n="common.cancel").btn Cancel
if isPatchCreator
if status != 'withdrawn'
- button.btn.btn-danger#withdraw-button Withdraw
+ button.btn.btn-danger#withdraw-button(data-i18n="general.withdraw") Withdraw
if isPatchRecipient
if status != 'accepted'
- button.btn.btn-primary#accept-button Accept
+ button.btn.btn-primary#accept-button(data-i18n="general.accept") Accept
if status != 'rejected'
- button.btn.btn-danger#reject-button Reject
-
+ button.btn.btn-danger#reject-button(data-i18n="general.reject") Reject
diff --git a/app/templates/play/ladder/ladder.jade b/app/templates/play/ladder/ladder.jade
index 8484e6c64..2e977c941 100644
--- a/app/templates/play/ladder/ladder.jade
+++ b/app/templates/play/ladder/ladder.jade
@@ -813,7 +813,7 @@ block content
th Ogre wins/losses/ties
else
th Ogre score
- th Spectate
+ th(data-i18n="play.spectate") Spectate
tbody
each human, index in winners.humans
- var ogre = winners.ogres[index]
@@ -855,7 +855,7 @@ block content
td
span= Math.round(100 * ogre.score)
td
- a(href="/play/spectate/" + level.get('slug') + "?session-one=" + human.sessionID + "&session-two=" + ogre.sessionID) Watch the battle
+ a(href="/play/spectate/" + level.get('slug') + "?session-one=" + human.sessionID + "&session-two=" + ogre.sessionID, data-i18n="ladder.watch_battle") Watch the battle
else
td
td
diff --git a/app/templates/play/ladder/simulate_tab.jade b/app/templates/play/ladder/simulate_tab.jade
index b7adb8e64..07576099e 100644
--- a/app/templates/play/ladder/simulate_tab.jade
+++ b/app/templates/play/ladder/simulate_tab.jade
@@ -8,18 +8,17 @@ p
button(data-i18n="ladder.simulate_games").btn.btn-warning.btn-lg.highlight#simulate-button Simulate Games!
p.simulation-count
- span(data-i18n="ladder.games_simulated_by") Games simulated by you:
- |
+ span.spr(data-i18n="ladder.games_simulated_by") Games simulated by you:
span#simulated-by-you= me.get('simulatedBy') || 0
p.simulation-count
- span(data-i18n="ladder.games_simulated_for") Games simulated for you:
- |
+ span.spr(data-i18n="ladder.games_simulated_for") Games simulated for you:
span#simulated-for-you= me.get('simulatedFor') || 0
+
p.simulation-count
- span(data-i18n="ladder.games_in_queue") Games currently in the queue:
- |
+ span.spr(data-i18n="ladder.games_in_queue") Games currently in the queue:
span#games-in-queue= numberOfGamesInQueue || 0
+
table.table.table-bordered.table-condensed.table-hover
thead
tr
diff --git a/app/templates/play/level/control_bar.jade b/app/templates/play/level/control_bar.jade
index c122681f1..6d1fc6fec 100644
--- a/app/templates/play/level/control_bar.jade
+++ b/app/templates/play/level/control_bar.jade
@@ -29,16 +29,16 @@ else
.buttons-area
if !observing
- button.btn.btn-inverse#game-menu-button(title="Show game menu")
+ button.btn.btn-inverse#game-menu-button(data-i18n="[title]play_level.show_menu", title="Show game menu")
.hamburger
span.icon-bar
span.icon-bar
span.icon-bar
span.game-menu-text(data-i18n="play_level.game_menu") Game Menu
-
+
if spectateGame
- button.btn.btn-xs.btn-inverse.banner#next-game-button(title="Next Game", data-i18n="play_level.next-game") Next game!
-
+ button.btn.btn-xs.btn-inverse.banner#next-game-button(data-i18n="play_level.next_game") Next game
+
if !observing
button.btn.btn-xs.btn-primary.banner#level-done-button(data-i18n="play_level.done") Done