From 237b022147d721aa4fefad847278a5c01e429ced Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 12 Dec 2014 21:43:20 +0000 Subject: [PATCH 1/7] Update edit.jade --- app/templates/editor/article/edit.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/editor/article/edit.jade b/app/templates/editor/article/edit.jade index 48f610ce2..63c0d85d3 100644 --- a/app/templates/editor/article/edit.jade +++ b/app/templates/editor/article/edit.jade @@ -23,7 +23,7 @@ block content #article-view - h3 Patches + h3(data-i18n="resources.patches") Patches .patches-view hr From 72485eb5a91e7717bded0bd1b14a10e804f4c3a7 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 12 Dec 2014 22:04:21 +0000 Subject: [PATCH 2/7] Update patches.jade Couldn't figure out how to handle "Pending", "Accepted", etc. --- app/templates/editor/patches.jade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/templates/editor/patches.jade b/app/templates/editor/patches.jade index 872788e7d..d5e63bb00 100644 --- a/app/templates/editor/patches.jade +++ b/app/templates/editor/patches.jade @@ -13,14 +13,14 @@ | Withdrawn if patches.loading - p Loading + p(data-i18n="common.loading") Loading... else table.table.table-condensed.table-bordered tr - th Submitter - th Submitted - th Commit Message - th Review + th(data-i18n="general.submitter") Submitter + th(data-i18n="general.submitted") Submitted + th(data-i18n="general.commit_msg") Commit Message + th(data-i18n="general.review") Review for patch in patches tr td= patch.userName From 3ab5ee22c9a6d6ee6dc58709d566b66701dc70dc Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 12 Dec 2014 22:15:10 +0000 Subject: [PATCH 3/7] Update versions-modal.jade --- app/templates/editor/modal/versions-modal.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/editor/modal/versions-modal.jade b/app/templates/editor/modal/versions-modal.jade index 7c9f7cc5c..bf38149e6 100755 --- a/app/templates/editor/modal/versions-modal.jade +++ b/app/templates/editor/modal/versions-modal.jade @@ -5,7 +5,7 @@ block modal-header-content h3 span(data-i18n="general.version_history_for") Version History for: |"#{dataList[0].name}" - p + p(data-i18n="general.select_changes") |Select two changes below to see the difference. div.delta-container @@ -30,4 +30,4 @@ block modal-body-content td= data.creator td #{data.commitMessage} -block modal-footer-content \ No newline at end of file +block modal-footer-content From e609ea7c5c9fcf4e2c7871ba1952395211f08931 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 12 Dec 2014 22:25:17 +0000 Subject: [PATCH 4/7] Update edit.jade --- app/templates/editor/level/edit.jade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/templates/editor/level/edit.jade b/app/templates/editor/level/edit.jade index 8a2a65458..8716b0c62 100644 --- a/app/templates/editor/level/edit.jade +++ b/app/templates/editor/level/edit.jade @@ -44,10 +44,10 @@ block header span.navbar-brand #{level.attributes.name} 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 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 span.glyphicon-arrow-right.glyphicon 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 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 span.glyphicon-play.glyphicon li.dropdown a(data-toggle='dropdown') span.glyphicon-chevron-down.glyphicon ul.dropdown-menu - li.dropdown-header Actions + li.dropdown-header(data-i18n="common.actions") Actions li a#level-watch-button span.watch @@ -98,11 +98,11 @@ block header li(class=anonymous ? "disabled": "") a(data-i18n="editor.pop_i18n")#pop-level-i18n-button Populate i18n li.divider - li.dropdown-header Info + li.dropdown-header(data-i18n="common.info") Info li#level-history-button a(href='#', data-i18n="general.version_history") Version History li.divider - li.dropdown-header Help + li.dropdown-header(data-i18n="common.help") Help li a(href='https://github.com/codecombat/codecombat/wiki/Artisan-Home', data-i18n="editor.wiki", target="_blank") Wiki li From 9c911ce1498e3d4ad4fe028d7c014bedde9f01f9 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 12 Dec 2014 22:32:19 +0000 Subject: [PATCH 5/7] Update thang-type-edit-view.jade --- .../editor/thang/thang-type-edit-view.jade | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/templates/editor/thang/thang-type-edit-view.jade b/app/templates/editor/thang/thang-type-edit-view.jade index 013410d3d..f9c5b1231 100644 --- a/app/templates/editor/thang/thang-type-edit-view.jade +++ b/app/templates/editor/thang/thang-type-edit-view.jade @@ -15,13 +15,13 @@ block header span.glyphicon-home.glyphicon ul.nav.navbar-nav.nav-tabs 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 - 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 - 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 - 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 a(href="#editor-thang-patches-view", data-toggle="tab")#patches-tab span(data-i18n="resources.patches").spr Patches @@ -51,7 +51,7 @@ block header a(data-toggle='dropdown') span.glyphicon-chevron-down.glyphicon ul.dropdown-menu - li.dropdown-header Actions + li.dropdown-header(data-i18n="common.actions") Actions li(class=anonymous ? "disabled": "") a(data-i18n="common.fork")#fork-start-button Fork li(class=anonymous ? "disabled": "") @@ -59,11 +59,11 @@ block header li(class=anonymous ? "disabled": "") a(data-i18n="editor.pop_i18n")#pop-level-i18n-button Populate i18n li.divider - li.dropdown-header Info + li.dropdown-header(data-i18n="common.info") Info li#history-button a(href='#', data-i18n="general.version_history") Version History li.divider - li.dropdown-header Help + li.dropdown-header(data-i18n="common.help") Help li a(href='https://github.com/codecombat/codecombat/wiki/Artisan-Home', data-i18n="editor.wiki", target="_blank") Wiki li From f98469122a7dbf6f8d8e12f8847def88a6766b7b Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 12 Dec 2014 22:35:16 +0000 Subject: [PATCH 6/7] Update i18n-edit-model-view.jade --- app/templates/i18n/i18n-edit-model-view.jade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/i18n/i18n-edit-model-view.jade b/app/templates/i18n/i18n-edit-model-view.jade index 596650e01..318438045 100644 --- a/app/templates/i18n/i18n-edit-model-view.jade +++ b/app/templates/i18n/i18n-edit-model-view.jade @@ -21,7 +21,7 @@ block header ul.nav.navbar-nav.navbar-right 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 @@ -29,17 +29,17 @@ block header span.glyphicon-chevron-down.glyphicon ul.dropdown-menu - li.dropdown-header Actions + li.dropdown-header(data-i18n="common.actions") Actions li(class=anonymous ? "disabled": "") a(data-toggle="coco-modal", data-target="modal/RevertModal", data-i18n="editor.revert")#revert-button Revert li.divider - li.dropdown-header Info + li.dropdown-header(data-i18n="common.info") Info li#history-button a(href='#', data-i18n="general.version_history") Version History li.divider - li.dropdown-header Help + li.dropdown-header(data-i18n="common.help") Help li a(href='https://github.com/codecombat/codecombat/wiki', data-i18n="editor.wiki", target="_blank") Wiki li From a6653501e582ccaee58278a42cceed5bdc2c5fc5 Mon Sep 17 00:00:00 2001 From: Imperadeiro98 Date: Fri, 12 Dec 2014 22:35:22 +0000 Subject: [PATCH 7/7] Update en.coffee --- app/locale/en.coffee | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 508a8b1e4..3189e4a5f 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -146,9 +146,13 @@ fork: "Fork" play: "Play" # When used as an action verb, like "Play next level" retry: "Retry" + actions: "Actions" + info: "Info" + help: "Help" watch: "Watch" unwatch: "Unwatch" submit_patch: "Submit Patch" + submit_changes: "Submit Changes" general: and: "and" @@ -156,9 +160,16 @@ date: "Date" body: "Body" version: "Version" + submitter: "Submitter" + submitted: "Submitted" commit_msg: "Commit Message" + review: "Review" version_history: "Version History" 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" results: "Results" description: "Description" @@ -581,6 +592,9 @@ more: "More" wiki: "Wiki" live_chat: "Live Chat" + thang_main: "Main" + thang_spritesheets: "Spritesheets" + thang_colors: "Colors" level_some_options: "Some Options?" level_tab_thangs: "Thangs" level_tab_scripts: "Scripts"