codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-02 11:58:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-05-26 10:32:12 -07:00
commit e75e1d168e
4 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/locale/ru.coffee
View file

@ -36,7 +36,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
nav: nav:
play: "Уровни" play: "Уровни"
# community: "Community" community: "Сообщество"
editor: "Редактор" editor: "Редактор"
blog: "Блог" blog: "Блог"
forum: "Форум" forum: "Форум"
@ -139,7 +139,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
group: "Группа" group: "Группа"
clothes: "Одежда" clothes: "Одежда"
trim: "Отделка" trim: "Отделка"
# cloud: "Cloud" cloud: "Облако"
team: "Облако" team: "Облако"
spell: "Заклинание" spell: "Заклинание"
boots: "Обувь" boots: "Обувь"
@ -746,11 +746,11 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
user_schema: "Пользовательская Schema" user_schema: "Пользовательская Schema"
user_profile: "Пользовательский профиль" user_profile: "Пользовательский профиль"
patches: "Патчи" patches: "Патчи"
# patched_model: "Source Document" patched_model: "Исходный документ"
model: "Модель" model: "Модель"
# system: "System" system: "Система"
# component: "Component" component: "Компонент"
# components: "Components" components: "Компоненты"
# thang: "Thang" # thang: "Thang"
# thangs: "Thangs" # thangs: "Thangs"
# level_session: "Your Session" # level_session: "Your Session"
@ -758,17 +758,17 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
# article: "Article" # article: "Article"
# user_names: "User Names" # user_names: "User Names"
# thang_names: "Thang Names" # thang_names: "Thang Names"
# files: "Files" files: "Файлы"
# top_simulators: "Top Simulators" # top_simulators: "Top Simulators"
# source_document: "Source Document" source_document: "Исходный документ"
# document: "Document" document: "Документ"
# sprite_sheet: "Sprite Sheet" # sprite_sheet: "Sprite Sheet"
# delta: delta:
# added: "Added" added: "Добавлено"
# modified: "Modified" modified: "Изменено"
# deleted: "Deleted" deleted: "Удалено"
# moved_index: "Moved Index" # moved_index: "Moved Index"
# text_diff: "Text Diff" text_diff: "Разница"
# merge_conflict_with: "MERGE CONFLICT WITH" # merge_conflict_with: "MERGE CONFLICT WITH"
# no_changes: "No Changes" no_changes: "Нет изменений"

2
app/schemas/models/user.coffee
View file

@ -60,7 +60,7 @@ UserSchema = c.object {},
colorConfig: c.object {additionalProperties: c.colorConfig()} colorConfig: c.object {additionalProperties: c.colorConfig()}
aceConfig: c.object {}, 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']} keyBindings: {type: 'string', 'default': 'default', 'enum': ['default', 'vim', 'emacs']}
invisibles: {type: 'boolean', 'default': false} invisibles: {type: 'boolean', 'default': false}
indentGuides: {type: 'boolean', 'default': false} indentGuides: {type: 'boolean', 'default': false}

1
app/views/play/level/modal/editor_config_modal.coffee
View file

@ -35,6 +35,7 @@ module.exports = class EditorConfigModal extends View
{id: 'python', name: 'Python (Experimental)'} {id: 'python', name: 'Python (Experimental)'}
{id: 'clojure', name: 'Clojure (Experimental)'} {id: 'clojure', name: 'Clojure (Experimental)'}
{id: 'lua', name: 'Lua (Experimental)'} {id: 'lua', name: 'Lua (Experimental)'}
{id: 'io', name: 'Io (Experimental)'}
] ]
c.sessionLanguage = @session.get('codeLanguage') ? @aceConfig.language c.sessionLanguage = @session.get('codeLanguage') ? @aceConfig.language
c.language = @aceConfig.language c.language = @aceConfig.language

1
app/views/play/level/tome/spell_view.coffee
View file

@ -21,6 +21,7 @@ module.exports = class SpellView extends View
'clojure': 'ace/mode/clojure' 'clojure': 'ace/mode/clojure'
'lua': 'ace/mode/lua' 'lua': 'ace/mode/lua'
'python': 'ace/mode/python' 'python': 'ace/mode/python'
'io': 'ace/mode/text'
keyBindings: keyBindings:
'default': null 'default': null