From 65a364d3f7151f554cc6901f84725eb146c4dd2b Mon Sep 17 00:00:00 2001 From: Burlutskiy Ivan Date: Wed, 21 May 2014 00:21:10 +0400 Subject: [PATCH 1/4] Update ru.coffee --- app/locale/ru.coffee | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index a87b82e4e..d73acc64b 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -719,9 +719,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi patches: "Патчи" # patched_model: "Source Document" model: "Модель" -# system: "System" -# component: "Component" -# components: "Components" +# system: "Система" +# component: "Компонент" +# components: "Компоненты" # thang: "Thang" # thangs: "Thangs" # level_session: "Your Session" @@ -729,17 +729,17 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # article: "Article" # user_names: "User Names" # thang_names: "Thang Names" -# files: "Files" +# files: "Файлы" # top_simulators: "Top Simulators" -# source_document: "Source Document" -# document: "Document" +# source_document: "Исходный документ" +# document: "Доумент" # sprite_sheet: "Sprite Sheet" # delta: -# added: "Added" -# modified: "Modified" -# deleted: "Deleted" +# added: "Добавлено" +# modified: "Изменено" +# deleted: "Удалено" # moved_index: "Moved Index" -# text_diff: "Text Diff" +# text_diff: "Раница" # merge_conflict_with: "MERGE CONFLICT WITH" -# no_changes: "No Changes" +# no_changes: "Нет изменений" From a8a50df025d051603a27d900bbac7c96f4a82477 Mon Sep 17 00:00:00 2001 From: Burlutskiy Ivan Date: Wed, 21 May 2014 01:32:15 +0400 Subject: [PATCH 2/4] Update ru.coffee Fixed previous typos; uncommented translations. --- app/locale/ru.coffee | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index d73acc64b..cc9bb4dd6 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -36,7 +36,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi nav: play: "Уровни" -# community: "Community" + community: "Сообщество" editor: "Редактор" blog: "Блог" forum: "Форум" @@ -138,8 +138,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi group: "Группа" clothes: "Одежда" trim: "Отделка" -# cloud: "Cloud" - team: "Облако" + cloud: "Облако" + team: "Команда" spell: "Заклинание" boots: "Обувь" hue: "Оттенок" @@ -717,11 +717,11 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi user_schema: "Пользовательская Schema" user_profile: "Пользовательский профиль" patches: "Патчи" -# patched_model: "Source Document" + patched_model: "Исходный документ" model: "Модель" -# system: "Система" -# component: "Компонент" -# components: "Компоненты" + system: "Система" + component: "Компонент" + components: "Компоненты" # thang: "Thang" # thangs: "Thangs" # level_session: "Your Session" @@ -729,17 +729,17 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi # article: "Article" # user_names: "User Names" # thang_names: "Thang Names" -# files: "Файлы" + files: "Файлы" # top_simulators: "Top Simulators" -# source_document: "Исходный документ" -# document: "Доумент" + source_document: "Исходный документ" + document: "Документ" # sprite_sheet: "Sprite Sheet" -# delta: -# added: "Добавлено" -# modified: "Изменено" -# deleted: "Удалено" + delta: + added: "Добавлено" + modified: "Изменено" + deleted: "Удалено" # moved_index: "Moved Index" -# text_diff: "Раница" + text_diff: "Разница" # merge_conflict_with: "MERGE CONFLICT WITH" -# no_changes: "Нет изменений" + no_changes: "Нет изменений" From 70403409f34491439c81823f453c4dde77f439c9 Mon Sep 17 00:00:00 2001 From: Burlutskiy Ivan Date: Wed, 21 May 2014 12:18:44 +0400 Subject: [PATCH 3/4] Update ru.coffee reverted team translation by @M-r-A request. --- 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 cc9bb4dd6..832a953dd 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -139,7 +139,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi clothes: "Одежда" trim: "Отделка" cloud: "Облако" - team: "Команда" + team: "Облако" spell: "Заклинание" boots: "Обувь" hue: "Оттенок" From ec0027043b866e6e06e75503cd55e915f6cd265e Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Mon, 26 May 2014 08:59:48 -0700 Subject: [PATCH 4/4] Added experimental Io language from Aether. --- app/schemas/models/user.coffee | 2 +- app/views/play/level/modal/editor_config_modal.coffee | 1 + app/views/play/level/tome/spell_view.coffee | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/schemas/models/user.coffee b/app/schemas/models/user.coffee index bf4072469..a6525bf91 100644 --- a/app/schemas/models/user.coffee +++ b/app/schemas/models/user.coffee @@ -60,7 +60,7 @@ UserSchema = c.object {}, colorConfig: c.object {additionalProperties: c.colorConfig()} aceConfig: c.object {}, - language: {type: 'string', 'default': 'javascript', 'enum': ['javascript', 'coffeescript', 'clojure', 'lua', 'python']} + language: {type: 'string', 'default': 'javascript', 'enum': ['javascript', 'coffeescript', 'clojure', 'lua', 'python', 'io']} keyBindings: {type: 'string', 'default': 'default', 'enum': ['default', 'vim', 'emacs']} invisibles: {type: 'boolean', 'default': false} indentGuides: {type: 'boolean', 'default': false} diff --git a/app/views/play/level/modal/editor_config_modal.coffee b/app/views/play/level/modal/editor_config_modal.coffee index 5047be476..a90afad08 100644 --- a/app/views/play/level/modal/editor_config_modal.coffee +++ b/app/views/play/level/modal/editor_config_modal.coffee @@ -35,6 +35,7 @@ module.exports = class EditorConfigModal extends View {id: 'python', name: 'Python (Experimental)'} {id: 'clojure', name: 'Clojure (Experimental)'} {id: 'lua', name: 'Lua (Experimental)'} + {id: 'io', name: 'Io (Experimental)'} ] c.sessionLanguage = @session.get('codeLanguage') ? @aceConfig.language c.language = @aceConfig.language diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/spell_view.coffee index 75f559bdf..f42ecb121 100644 --- a/app/views/play/level/tome/spell_view.coffee +++ b/app/views/play/level/tome/spell_view.coffee @@ -21,6 +21,7 @@ module.exports = class SpellView extends View 'clojure': 'ace/mode/clojure' 'lua': 'ace/mode/lua' 'python': 'ace/mode/python' + 'io': 'ace/mode/text' keyBindings: 'default': null