Merge branch 'master' into production

app/locale/ru.coffee

@@ -36,7 +36,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 
   nav:
     play: "Уровни"
-#    community: "Community"
+    community: "Сообщество"
     editor: "Редактор"
     blog: "Блог"
     forum: "Форум"
@@ -139,7 +139,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     group: "Группа"
     clothes: "Одежда"
     trim: "Отделка"
-#    cloud: "Cloud"
+    cloud: "Облако"
     team: "Облако"
     spell: "Заклинание"
     boots: "Обувь"
@@ -746,11 +746,11 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     user_schema: "Пользовательская Schema"
     user_profile: "Пользовательский профиль"
     patches: "Патчи"
-#    patched_model: "Source Document"
+    patched_model: "Исходный документ"
     model: "Модель"
-#    system: "System"
-#    component: "Component"
-#    components: "Components"
+    system: "Система"
+    component: "Компонент"
+    components: "Компоненты"
 #    thang: "Thang"
 #    thangs: "Thangs"
 #    level_session: "Your Session"
@@ -758,17 +758,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"
+  delta:
+    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: "Нет изменений"

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}

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

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