Merge pull request #1926 from Imperadeiro98/master

Internationalized more stuff
This commit is contained in:
Nick Winter 2014-12-12 16:11:03 -08:00
commit 25b91f900d
7 changed files with 39 additions and 25 deletions

View file

@ -146,9 +146,13 @@
fork: "Fork" fork: "Fork"
play: "Play" # When used as an action verb, like "Play next level" play: "Play" # When used as an action verb, like "Play next level"
retry: "Retry" retry: "Retry"
actions: "Actions"
info: "Info"
help: "Help"
watch: "Watch" watch: "Watch"
unwatch: "Unwatch" unwatch: "Unwatch"
submit_patch: "Submit Patch" submit_patch: "Submit Patch"
submit_changes: "Submit Changes"
general: general:
and: "and" and: "and"
@ -156,9 +160,16 @@
date: "Date" date: "Date"
body: "Body" body: "Body"
version: "Version" version: "Version"
submitter: "Submitter"
submitted: "Submitted"
commit_msg: "Commit Message" commit_msg: "Commit Message"
review: "Review"
version_history: "Version History" version_history: "Version History"
version_history_for: "Version History for: " version_history_for: "Version History for: "
select_changes: "Select two changes below to see the difference."
undo: "Undo (Ctrl+Z)"
redo: "Redo (Ctrl+Shift+Z)"
play_preview: "Play preview of current level"
result: "Result" result: "Result"
results: "Results" results: "Results"
description: "Description" description: "Description"
@ -582,6 +593,9 @@
more: "More" more: "More"
wiki: "Wiki" wiki: "Wiki"
live_chat: "Live Chat" live_chat: "Live Chat"
thang_main: "Main"
thang_spritesheets: "Spritesheets"
thang_colors: "Colors"
level_some_options: "Some Options?" level_some_options: "Some Options?"
level_tab_thangs: "Thangs" level_tab_thangs: "Thangs"
level_tab_scripts: "Scripts" level_tab_scripts: "Scripts"

View file

@ -23,7 +23,7 @@ block content
#article-view #article-view
h3 Patches h3(data-i18n="resources.patches") Patches
.patches-view .patches-view
hr hr

View file

@ -44,10 +44,10 @@ block header
span.navbar-brand #{level.attributes.name} span.navbar-brand #{level.attributes.name}
ul.nav.navbar-nav.navbar-right ul.nav.navbar-nav.navbar-right
li#undo-button(title="Undo (Ctrl+Z)") li#undo-button(data-i18n="[title]general.undo", title="Undo (Ctrl+Z)")
a a
span.glyphicon-arrow-left.glyphicon span.glyphicon-arrow-left.glyphicon
li#redo-button(title="Redo (Ctrl+Shift+Z)") li#redo-button(data-i18n="[title]general.redo", title="Redo (Ctrl+Shift+Z)")
a a
span.glyphicon-arrow-right.glyphicon span.glyphicon-arrow-right.glyphicon
if authorized if authorized
@ -72,14 +72,14 @@ block header
a.play-with-team-button(data-team=match.yourTeam, data-opponent=match.opponentSessionID)= match.yourTeam + ' vs. ' + match.opponentName a.play-with-team-button(data-team=match.yourTeam, data-opponent=match.opponentSessionID)= match.yourTeam + ' vs. ' + match.opponentName
else else
li(title="⌃↩ or ⌘↩: Play preview of current level")#play-button li(data-i18n="[title]general.play_preview", title="Play preview of current level")#play-button
a a
span.glyphicon-play.glyphicon span.glyphicon-play.glyphicon
li.dropdown li.dropdown
a(data-toggle='dropdown') a(data-toggle='dropdown')
span.glyphicon-chevron-down.glyphicon span.glyphicon-chevron-down.glyphicon
ul.dropdown-menu ul.dropdown-menu
li.dropdown-header Actions li.dropdown-header(data-i18n="common.actions") Actions
li li
a#level-watch-button a#level-watch-button
span.watch span.watch
@ -98,11 +98,11 @@ block header
li(class=anonymous ? "disabled": "") li(class=anonymous ? "disabled": "")
a(data-i18n="editor.pop_i18n")#pop-level-i18n-button Populate i18n a(data-i18n="editor.pop_i18n")#pop-level-i18n-button Populate i18n
li.divider li.divider
li.dropdown-header Info li.dropdown-header(data-i18n="common.info") Info
li#level-history-button li#level-history-button
a(href='#', data-i18n="general.version_history") Version History a(href='#', data-i18n="general.version_history") Version History
li.divider li.divider
li.dropdown-header Help li.dropdown-header(data-i18n="common.help") Help
li li
a(href='https://github.com/codecombat/codecombat/wiki/Artisan-Home', data-i18n="editor.wiki", target="_blank") Wiki a(href='https://github.com/codecombat/codecombat/wiki/Artisan-Home', data-i18n="editor.wiki", target="_blank") Wiki
li li

View file

@ -5,7 +5,7 @@ block modal-header-content
h3 h3
span(data-i18n="general.version_history_for") Version History for: span(data-i18n="general.version_history_for") Version History for:
|"#{dataList[0].name}" |"#{dataList[0].name}"
p p(data-i18n="general.select_changes")
|Select two changes below to see the difference. |Select two changes below to see the difference.
div.delta-container div.delta-container

View file

@ -13,14 +13,14 @@
| Withdrawn | Withdrawn
if patches.loading if patches.loading
p Loading p(data-i18n="common.loading") Loading...
else else
table.table.table-condensed.table-bordered table.table.table-condensed.table-bordered
tr tr
th Submitter th(data-i18n="general.submitter") Submitter
th Submitted th(data-i18n="general.submitted") Submitted
th Commit Message th(data-i18n="general.commit_msg") Commit Message
th Review th(data-i18n="general.review") Review
for patch in patches for patch in patches
tr tr
td= patch.userName td= patch.userName

View file

@ -15,13 +15,13 @@ block header
span.glyphicon-home.glyphicon span.glyphicon-home.glyphicon
ul.nav.navbar-nav.nav-tabs ul.nav.navbar-nav.nav-tabs
li.active li.active
a(href="#editor-thang-main-tab-view", data-toggle="tab") Main a(href="#editor-thang-main-tab-view", data-toggle="tab", data-i18n="editor.thang_main") Main
li li
a(href="#editor-thang-components-tab-view", data-toggle="tab") Components a(href="#editor-thang-components-tab-view", data-toggle="tab", data-i18n="editor.level_tab_components") Components
li li
a(href="#editor-thang-spritesheets-view", data-toggle="tab") Spritesheets a(href="#editor-thang-spritesheets-view", data-toggle="tab", data-i18n="editor.thang_spritesheets") Spritesheets
li li
a(href="#editor-thang-colors-tab-view", data-toggle="tab")#color-tab Colors a(href="#editor-thang-colors-tab-view", data-toggle="tab", data-i18n="editor.thang_colors")#color-tab Colors
li li
a(href="#editor-thang-patches-view", data-toggle="tab")#patches-tab a(href="#editor-thang-patches-view", data-toggle="tab")#patches-tab
span(data-i18n="resources.patches").spr Patches span(data-i18n="resources.patches").spr Patches
@ -51,7 +51,7 @@ block header
a(data-toggle='dropdown') a(data-toggle='dropdown')
span.glyphicon-chevron-down.glyphicon span.glyphicon-chevron-down.glyphicon
ul.dropdown-menu ul.dropdown-menu
li.dropdown-header Actions li.dropdown-header(data-i18n="common.actions") Actions
li(class=anonymous ? "disabled": "") li(class=anonymous ? "disabled": "")
a(data-i18n="common.fork")#fork-start-button Fork a(data-i18n="common.fork")#fork-start-button Fork
li(class=anonymous ? "disabled": "") li(class=anonymous ? "disabled": "")
@ -59,11 +59,11 @@ block header
li(class=anonymous ? "disabled": "") li(class=anonymous ? "disabled": "")
a(data-i18n="editor.pop_i18n")#pop-level-i18n-button Populate i18n a(data-i18n="editor.pop_i18n")#pop-level-i18n-button Populate i18n
li.divider li.divider
li.dropdown-header Info li.dropdown-header(data-i18n="common.info") Info
li#history-button li#history-button
a(href='#', data-i18n="general.version_history") Version History a(href='#', data-i18n="general.version_history") Version History
li.divider li.divider
li.dropdown-header Help li.dropdown-header(data-i18n="common.help") Help
li li
a(href='https://github.com/codecombat/codecombat/wiki/Artisan-Home', data-i18n="editor.wiki", target="_blank") Wiki a(href='https://github.com/codecombat/codecombat/wiki/Artisan-Home', data-i18n="editor.wiki", target="_blank") Wiki
li li

View file

@ -21,7 +21,7 @@ block header
ul.nav.navbar-nav.navbar-right ul.nav.navbar-nav.navbar-right
li li
button.btn.btn-info.btn-sm.pull-right#patch-submit(disabled=model.hasLocalChanges() ? null : 'disabled', value=model.id) Submit Changes button.btn.btn-info.btn-sm.pull-right#patch-submit(disabled=model.hasLocalChanges() ? null : 'disabled', value=model.id, data-i18n="common.submit_changes") Submit Changes
li.dropdown li.dropdown
@ -29,17 +29,17 @@ block header
span.glyphicon-chevron-down.glyphicon span.glyphicon-chevron-down.glyphicon
ul.dropdown-menu ul.dropdown-menu
li.dropdown-header Actions li.dropdown-header(data-i18n="common.actions") Actions
li(class=anonymous ? "disabled": "") li(class=anonymous ? "disabled": "")
a(data-toggle="coco-modal", data-target="modal/RevertModal", data-i18n="editor.revert")#revert-button Revert a(data-toggle="coco-modal", data-target="modal/RevertModal", data-i18n="editor.revert")#revert-button Revert
li.divider li.divider
li.dropdown-header Info li.dropdown-header(data-i18n="common.info") Info
li#history-button li#history-button
a(href='#', data-i18n="general.version_history") Version History a(href='#', data-i18n="general.version_history") Version History
li.divider li.divider
li.dropdown-header Help li.dropdown-header(data-i18n="common.help") Help
li li
a(href='https://github.com/codecombat/codecombat/wiki', data-i18n="editor.wiki", target="_blank") Wiki a(href='https://github.com/codecombat/codecombat/wiki', data-i18n="editor.wiki", target="_blank") Wiki
li li