From bfebd0b47ac4cf7747e710207514d27f6c5e628a Mon Sep 17 00:00:00 2001
From: Alexei Nikitin <mr-a1@yandex.ru>
Date: Sun, 9 Mar 2014 04:13:30 +0400
Subject: [PATCH 1/5] Add revert i18n
---
app/locale/ru.coffee | 2 ++
app/templates/editor/article/edit.jade | 2 +-
app/templates/editor/level/edit.jade | 2 +-
app/templates/editor/thang/edit.jade | 2 +-
app/templates/modal/revert.jade | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 36bcf1ac1..1cb8f0c53 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -226,6 +226,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
contact_us: "свяжитесь с нами!"
hipchat_prefix: "Также вы можете найти нас в нашей"
hipchat_url: "комнате HipChat."
+ revert: "Откатить"
+ revert_models: "Откатить Модели"
level_some_options: "Ещё опции"
level_tab_thangs: "Объекты"
level_tab_scripts: "Скрипты"
diff --git a/app/templates/editor/article/edit.jade b/app/templates/editor/article/edit.jade
index 7c6a7136a..3bd861bd9 100644
--- a/app/templates/editor/article/edit.jade
+++ b/app/templates/editor/article/edit.jade
@@ -10,7 +10,7 @@ block content
li.active
| #{article.attributes.name}
- button(data-toggle="coco-modal", data-target="modal/revert", data-i18n="revert.revert", disabled=authorized === true ? undefined : "true").btn.btn-primary#revert-button Revert
+ button(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert", disabled=authorized === true ? undefined : "true").btn.btn-primary#revert-button Revert
button(data-i18n="article.edit_btn_preview", disabled=authorized === true ? undefined : "true").btn.btn-primary#preview-button Preview
button(data-toggle="coco-modal", data-target="modal/save_version", data-i18n="common.save", disabled=authorized === true ? undefined : "true").btn.btn-primary#save-button Save
diff --git a/app/templates/editor/level/edit.jade b/app/templates/editor/level/edit.jade
index 7d2c7ac66..4166c81a1 100644
--- a/app/templates/editor/level/edit.jade
+++ b/app/templates/editor/level/edit.jade
@@ -29,7 +29,7 @@ block outer_content
ul.nav.navbar-nav.navbar-right
- li(data-toggle="coco-modal", data-target="modal/revert", data-i18n="revert.revert", disabled=authorized === true ? undefined : "true").btn.btn-primary.navbar-btn#revert-button Revert
+ li(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert", disabled=authorized === true ? undefined : "true").btn.btn-primary.navbar-btn#revert-button Revert
li(data-i18n="common.save", disabled=authorized === true ? undefined : "true").btn.btn-primary.navbar-btn#commit-level-start-button Save
li(data-i18n="common.fork", disabled=anonymous ? "true": undefined).btn.btn-primary.navbar-btn#fork-level-start-button Fork
li(title="⌃↩ or ⌘↩: Play preview of current level", data-i18n="common.play")#play-button.btn.btn-inverse.banner.navbar-btn Play!
diff --git a/app/templates/editor/thang/edit.jade b/app/templates/editor/thang/edit.jade
index af30eb2c1..52422fe9a 100644
--- a/app/templates/editor/thang/edit.jade
+++ b/app/templates/editor/thang/edit.jade
@@ -13,7 +13,7 @@ block content
img#portrait.img-thumbnail
button.btn.btn-primary#save-button(data-toggle="coco-modal", data-target="modal/save_version", disabled=authorized === true ? undefined : "true") Save
- button.btn.btn-primary#revert-button(data-toggle="coco-modal", data-target="modal/revert", data-i18n="revert.revert", disabled=authorized === true ? undefined : "true") Revert
+ button.btn.btn-primary#revert-button(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert", disabled=authorized === true ? undefined : "true") Revert
h3 Edit Thang Type: "#{thangType.attributes.name}"
diff --git a/app/templates/modal/revert.jade b/app/templates/modal/revert.jade
index adfd7688a..f20edd7d2 100644
--- a/app/templates/modal/revert.jade
+++ b/app/templates/modal/revert.jade
@@ -1,7 +1,7 @@
extends /templates/modal/modal_base
block modal-header-content
- h3(data-i18n="revert.revert_models") Revert Models
+ h3(data-i18n="editor.revert_models") Revert Models
block modal-body-content
table.table.table-striped#changed-models
From f6d68055345f3e2abb2f8eb2920b49a418987814 Mon Sep 17 00:00:00 2001
From: Alexei Nikitin <mr-a1@yandex.ru>
Date: Sun, 9 Mar 2014 04:31:15 +0400
Subject: [PATCH 2/5] Add password i18n
---
app/locale/ru.coffee | 1 +
app/templates/modal/login.jade | 2 +-
app/templates/modal/signup.jade | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 1cb8f0c53..55c0f2fbf 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -266,6 +266,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
description: "Описание"
or: "или"
email: "Email"
+ password: "Пароль"
message: "Сообщение"
about:
diff --git a/app/templates/modal/login.jade b/app/templates/modal/login.jade
index ae6b8b236..bd0307824 100644
--- a/app/templates/modal/login.jade
+++ b/app/templates/modal/login.jade
@@ -9,7 +9,7 @@ block modal-body-content
label.control-label(for="login-email", data-i18n="general.email") Email
input#login-email.input-large.form-control(name="email", type="email")
.form-group
- label.control-label(for="login-password", data-i18n="forms.password") Password
+ label.control-label(for="login-password", data-i18n="general.password") Password
input#login-password.input-large.form-control(name="password", type="password")
block modal-body-wait-content
diff --git a/app/templates/modal/signup.jade b/app/templates/modal/signup.jade
index d99fed9d6..2b27577d2 100644
--- a/app/templates/modal/signup.jade
+++ b/app/templates/modal/signup.jade
@@ -12,7 +12,7 @@ block modal-body-content
label.control-label(for="signup-email", data-i18n="general.email") Email
input#signup-email.form-control.input-large(name="email", type="email")
.form-group
- label.control-label(for="signup-password", data-i18n="forms.password") Password
+ label.control-label(for="signup-password", data-i18n="general.password") Password
input#signup-password.input-large.form-control(name="password", type="password")
hr
.form-group.checkbox
From 81084a24c63a8e8dbc6ebd837f60c2d57087333f Mon Sep 17 00:00:00 2001
From: Alexei Nikitin <mr-a1@yandex.ru>
Date: Sun, 9 Mar 2014 04:36:48 +0400
Subject: [PATCH 3/5] Add admin i18n
---
app/locale/ru.coffee | 1 +
app/templates/account/settings.jade | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 55c0f2fbf..6c52002e5 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -122,6 +122,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
wizard_tab: "Волшебник"
password_tab: "Пароль"
emails_tab: "Email-адреса"
+ admin: "Админ"
gravatar_select: "Выберите, какое фото с Gravatar использовать"
gravatar_add_photos: "Чтобы выбрать изображение, добавьте фото и уменьшенные изображения в ваш Gravatar-аккаунт."
gravatar_add_more_photos: "Добавьте больше фото к вашему аккаунту в Gravatar, чтобы использовать их здесь."
diff --git a/app/templates/account/settings.jade b/app/templates/account/settings.jade
index d64936645..91b533b1b 100644
--- a/app/templates/account/settings.jade
+++ b/app/templates/account/settings.jade
@@ -34,7 +34,7 @@ block content
input#email.form-control(name="email", type="text", value="#{me.get('email')}")
if !isProduction
.form-group.checkbox
- label(for="email", data-i18n="forms.admin") Admin
+ label(for="email", data-i18n="account_settings.admin") Admin
input#admin(name="admin", type="checkbox", checked=me.get('permissions').indexOf('admin')>-1))
From bcaa801f880cb7004fdbb27f8e33873aced842f0 Mon Sep 17 00:00:00 2001
From: Alexei Nikitin <mr-a1@yandex.ru>
Date: Sun, 9 Mar 2014 05:04:11 +0400
Subject: [PATCH 4/5] Sync en i18n
---
app/locale/en.coffee | 6 +++++-
app/locale/ru.coffee | 6 ++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 5ca5cf902..e3c694f82 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -122,6 +122,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
wizard_tab: "Wizard"
password_tab: "Password"
emails_tab: "Emails"
+ admin: "Admin"
gravatar_select: "Select which Gravatar photo to use"
gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
@@ -226,6 +227,8 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
contact_us: "contact us!"
hipchat_prefix: "You can also find us in our"
hipchat_url: "HipChat room."
+ revert: "Revert"
+ revert_models: "Revert Models"
level_some_options: "Some Options?"
level_tab_thangs: "Thangs"
level_tab_scripts: "Scripts"
@@ -270,6 +273,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
description: "Description"
or: "or"
email: "Email"
+ password: "Password"
message: "Message"
about:
@@ -407,7 +411,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
more_about_adventurer: "Learn More About Becoming an Adventurer"
adventurer_subscribe_desc: "Get emails when there are new levels to test."
scribe_summary_pref: "CodeCombat is not just going to be a bunch of levels. It will also be a resource of programming knowledge that players can hook into. That way, each Artisan can link to a detailed article that for the player's edification: documentation akin to what the "
- scribe_summary_sufx: " has built. If you enjoy explaining programming concepts, then this class is for you."
+ scribe_summary_suf: " has built. If you enjoy explaining programming concepts, then this class is for you."
scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
scribe_introduction_url_mozilla: "Mozilla Developer Network"
scribe_introduction_suf: " has built. If your idea of fun is articulating the concepts of programming in Markdown form, then this class might be for you."
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 6c52002e5..24c129bf9 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -251,6 +251,12 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
create_system_title: "Создать новую систему"
new_component_title: "Создать новый компонент"
new_component_field_system: "Система"
+ new_article_title: "Создать новую статью"
+ new_thang_title: "Создать новый объект"
+ new_level_title: "Создать новый уровень"
+ article_search_title: "Искать статьи"
+ thang_search_title: "Искать типы объектов"
+ level_search_title: "Искать уровни"
article:
edit_btn_preview: "Предпросмотр"
From 59318678bac69b6d5b276e7bc0c61cbd58513df2 Mon Sep 17 00:00:00 2001
From: Alexei Nikitin <mr-a1@yandex.ru>
Date: Sun, 9 Mar 2014 05:06:53 +0400
Subject: [PATCH 5/5] Update ru
---
app/locale/ru.coffee | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 24c129bf9..0296d95d4 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -252,7 +252,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
new_component_title: "Создать новый компонент"
new_component_field_system: "Система"
new_article_title: "Создать новую статью"
- new_thang_title: "Создать новый объект"
+ new_thang_title: "Создать новый тип объектов"
new_level_title: "Создать новый уровень"
article_search_title: "Искать статьи"
thang_search_title: "Искать типы объектов"