From 46133ab85d3bd57179134c1d9e4fa0a2b990ae6e Mon Sep 17 00:00:00 2001 From: Dominik Kundel Date: Sat, 15 Mar 2014 22:00:29 +0100 Subject: [PATCH 1/7] added select statement for programming language --- app/locale/de.coffee | 6 ++++-- app/locale/en.coffee | 2 ++ app/templates/play/level/modal/editor_config.jade | 10 ++++++++-- .../play/level/modal/editor_config_modal.coffee | 15 +++++++++++---- server/users/user_schema.coffee | 1 + 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/app/locale/de.coffee b/app/locale/de.coffee index 155669e56..379370423 100644 --- a/app/locale/de.coffee +++ b/app/locale/de.coffee @@ -209,6 +209,8 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra skip_tutorial: "Überspringen (Esc)" editor_config: "Editor Einstellungen" editor_config_title: "Editor Einstellungen" + editor_config_language_label: "Programmiersprache" + editor_config_language_description: "Bestimme die Programmiersprache in der du arbeiten möchtest." editor_config_keybindings_label: "Tastenbelegung" editor_config_keybindings_default: "Standard (Ace)" editor_config_keybindings_description: "Fügt zusätzliche Tastenkombinationen, bekannt aus anderen Editoren, hinzu" @@ -216,8 +218,8 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra editor_config_invisibles_description: "Zeigt unsichtbare Zeichen wie Leertasten an." editor_config_indentguides_label: "Zeige Einrückungshilfe" editor_config_indentguides_description: "Zeigt vertikale Linien an um Einrückungen besser zu sehen." -# editor_config_behaviors_label: "Smart Behaviors" -# editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes." + editor_config_behaviors_label: "Intelligentes Verhalten" + editor_config_behaviors_description: "Vervollständigt automatisch Klammern und Anführungszeichen." admin: av_title: "Administrator Übersicht" diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 204317e0b..eb798ec28 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -209,6 +209,8 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr skip_tutorial: "Skip (esc)" editor_config: "Editor Config" editor_config_title: "Editor Configuration" + editor_config_language_label: "Programming Language" + editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Key Bindings" editor_config_keybindings_default: "Default (Ace)" editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/templates/play/level/modal/editor_config.jade b/app/templates/play/level/modal/editor_config.jade index ca622f77c..cb76fa07a 100644 --- a/app/templates/play/level/modal/editor_config.jade +++ b/app/templates/play/level/modal/editor_config.jade @@ -5,14 +5,20 @@ .modal-body .form + .form-group.select-group + label.control-label(for="tome-language" data-i18n="play_level.editor_config_language_label") Programming Language + select#tome-language(name="language") + option(value="javascript" selected=(language === "javascript")) JavaScript + option(value="coffeescript" selected=(language === "coffeescript")) CoffeeScript + span.help-block(data-i18n="play_level.editor_config_language_description") Define the programming language you want to code in. .form-group.select-group label.control-label(for="tome-key-bindings" data-i18n="play_level.editor_config_keybindings_label") Key Bindings - select#tome-key-bindings(name="keyBindings", type="checkbox", checked=multiplayer) + select#tome-key-bindings(name="keyBindings") option(value="default" selected=(keyBindings === "default") data-i18n="play_level.editor_config_keybindings_default") Default (Ace) option(value="vim" selected=(keyBindings === "vim")) Vim option(value="emacs" selected=(keyBindings === "emacs")) Emacs span.help-block(data-i18n="play_level.editor_config_keybindings_description") Adds additional shortcuts known from the common editors. - .form-group.checkbox + .form-group.checkboxd label(for="tome-invisibles") input#tome-invisibles(name="invisibles", type="checkbox", checked=invisibles) span(data-i18n="play_level.editor_config_invisibles_label") Show Invisibles diff --git a/app/views/play/level/modal/editor_config_modal.coffee b/app/views/play/level/modal/editor_config_modal.coffee index 044a4dfaa..ded3bdf5e 100644 --- a/app/views/play/level/modal/editor_config_modal.coffee +++ b/app/views/play/level/modal/editor_config_modal.coffee @@ -8,14 +8,16 @@ module.exports = class EditorConfigModal extends View aceConfig: {} defaultConfig: + language: 'javascript' keyBindings: 'default' invisibles: false indentGuides: false behaviors: false events: - 'change #tome-invisibles': 'updateInvisiblesSelection' - 'change #tome-key-bindings': 'updateKeyBindingsSelection' + 'change #tome-invisibles': 'updateInvisibles' + 'change #tome-language': 'updateLanguage' + 'change #tome-key-bindings': 'updateKeyBindings' 'change #tome-indent-guides': 'updateIndentGuides' 'change #tome-behaviors': 'updateBehaviors' @@ -26,16 +28,20 @@ module.exports = class EditorConfigModal extends View @aceConfig = _.cloneDeep me.get('aceConfig') ? {} @aceConfig = _.defaults @aceConfig, @defaultConfig c = super() + c.language = @aceConfig.language c.keyBindings = @aceConfig.keyBindings c.invisibles = @aceConfig.invisibles c.indentGuides = @aceConfig.indentGuides c.behaviors = @aceConfig.behaviors c - updateInvisiblesSelection: -> + updateLanguage: -> + @aceConfig.language = @$el.find('#tome-language').val() + + updateInvisibles: -> @aceConfig.invisibles = @$el.find('#tome-invisibles').prop('checked') - updateKeyBindingsSelection: -> + updateKeyBindings: -> @aceConfig.keyBindings = @$el.find('#tome-key-bindings').val() updateIndentGuides: -> @@ -48,6 +54,7 @@ module.exports = class EditorConfigModal extends View super() onHidden: -> + @aceConfig.language = @$el.find('#tome-language').val() @aceConfig.invisibles = @$el.find('#tome-invisibles').prop('checked') @aceConfig.keyBindings = @$el.find('#tome-key-bindings').val() @aceConfig.indentGuides = @$el.find('#tome-indent-guides').prop('checked') diff --git a/server/users/user_schema.coffee b/server/users/user_schema.coffee index 650d680d6..385fc648c 100644 --- a/server/users/user_schema.coffee +++ b/server/users/user_schema.coffee @@ -46,6 +46,7 @@ UserSchema = c.object {}, colorConfig: c.object {additionalProperties: c.colorConfig()} aceConfig: c.object {}, + language: {type: 'string', 'default': 'javascript', 'enum': ['javascript', 'coffeescript']} keyBindings: {type: 'string', 'default': 'default', 'enum': ['default', 'vim', 'emacs']} invisibles: {type: 'boolean', 'default': false} indentGuides: {type: 'boolean', 'default': false} From ce6533de59595ccdd81045c2effe4c05df28b2d1 Mon Sep 17 00:00:00 2001 From: Dominik Kundel Date: Sat, 15 Mar 2014 23:14:57 +0100 Subject: [PATCH 2/7] changing ace edit mode based on setting --- app/views/play/level/tome/spell_view.coffee | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/spell_view.coffee index e9ac98dab..c3639e6b3 100644 --- a/app/views/play/level/tome/spell_view.coffee +++ b/app/views/play/level/tome/spell_view.coffee @@ -15,6 +15,10 @@ module.exports = class SpellView extends View eventsSuppressed: true writable: true + editModes: + 'javascript': 'ace/mode/javascript' + 'coffeescript': 'ace/mode/coffeescript' + keyBindings: 'default': null 'vim': 'ace/keyboard/vim' @@ -67,7 +71,7 @@ module.exports = class SpellView extends View @aceSession = @ace.getSession() @aceDoc = @aceSession.getDocument() @aceSession.setUseWorker false - @aceSession.setMode 'ace/mode/javascript' + @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] @aceSession.setWrapLimitRange null @aceSession.setUseWrapMode true @aceSession.setNewLineMode "unix" @@ -561,9 +565,10 @@ module.exports = class SpellView extends View onChangeEditorConfig: (e) -> aceConfig = me.get 'aceConfig' - @ace.setDisplayIndentGuides (aceConfig.indentGuides || false) - @ace.setShowInvisibles (aceConfig.invisibles || false) - @ace.setKeyboardHandler (@keyBindings[aceConfig.keyBindings] || null) + @ace.setDisplayIndentGuides aceConfig.indentGuides # default false + @ace.setShowInvisibles # default false + @ace.setKeyboardHandler @keyBindings[aceConfig.keyBindings ? 'default'] + @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] dismiss: -> @recompile() if @spell.hasChangedSignificantly @getSource() From 6a983dcb8cb22eb5a3a682d5573c60e2d6046f85 Mon Sep 17 00:00:00 2001 From: Dominik Kundel Date: Mon, 17 Mar 2014 02:14:04 +0100 Subject: [PATCH 3/7] changed name of event triggered when config is changed and introduced new event when language is changed --- app/views/play/level/modal/editor_config_modal.coffee | 4 +++- app/views/play/level/tome/spell.coffee | 9 +++++++++ app/views/play/level/tome/spell_view.coffee | 9 +++++++-- app/views/play/level/tome/tome_view.coffee | 4 ++++ 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/views/play/level/modal/editor_config_modal.coffee b/app/views/play/level/modal/editor_config_modal.coffee index ded3bdf5e..6eee66071 100644 --- a/app/views/play/level/modal/editor_config_modal.coffee +++ b/app/views/play/level/modal/editor_config_modal.coffee @@ -54,13 +54,15 @@ module.exports = class EditorConfigModal extends View super() onHidden: -> + oldLanguage = @aceConfig.language @aceConfig.language = @$el.find('#tome-language').val() @aceConfig.invisibles = @$el.find('#tome-invisibles').prop('checked') @aceConfig.keyBindings = @$el.find('#tome-key-bindings').val() @aceConfig.indentGuides = @$el.find('#tome-indent-guides').prop('checked') @aceConfig.behaviors = @$el.find('#tome-behaviors').prop('checked') me.set 'aceConfig', @aceConfig - Backbone.Mediator.publish 'change:editor-config' + Backbone.Mediator.publish 'tome:change-config' + Backbone.Mediator.publish 'tome:change-language' unless @aceConfig.language is oldLanguage me.save() destroy: -> diff --git a/app/views/play/level/tome/spell.coffee b/app/views/play/level/tome/spell.coffee index deaf856f8..b18263e9f 100644 --- a/app/views/play/level/tome/spell.coffee +++ b/app/views/play/level/tome/spell.coffee @@ -85,11 +85,13 @@ module.exports = class Spell aether.hasChangedSignificantly (newSource ? @originalSource), (currentSource ? @source), true, true createAether: (thang) -> + aceConfig = me.get 'aceConfig' ? {} aetherOptions = problems: jshint_W040: {level: "ignore"} jshint_W030: {level: "ignore"} # aether_NoEffect instead aether_MissingThis: {level: (if thang.requiresThis then 'error' else 'warning')} + language: aceConfig.language ? 'javascript' functionName: @name functionParameters: @parameters yieldConditionally: thang.plan? @@ -107,5 +109,12 @@ module.exports = class Spell aether = new Aether aetherOptions aether + updateLanguageAether: -> + aceConfig = me.get 'aceConfig' ? {} + for thangId, spellThang of @thangs + spellThang.aether?.setLanguage (aceConfig.language ? 'javascript') + spellThang.castAether = null + @transpile() + toString: -> "" diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/spell_view.coffee index c3639e6b3..3cfa7f347 100644 --- a/app/views/play/level/tome/spell_view.coffee +++ b/app/views/play/level/tome/spell_view.coffee @@ -38,8 +38,9 @@ module.exports = class SpellView extends View 'modal-closed': 'focus' 'focus-editor': 'focus' 'tome:spell-statement-index-updated': 'onStatementIndexUpdated' + 'tome:change-language': 'onChangeLanguage' + 'tome:change-config': 'onChangeEditorConfig' 'spell-beautify': 'onSpellBeautify' - 'change:editor-config': 'onChangeEditorConfig' events: 'mouseout': 'onMouseOut' @@ -566,10 +567,14 @@ module.exports = class SpellView extends View onChangeEditorConfig: (e) -> aceConfig = me.get 'aceConfig' @ace.setDisplayIndentGuides aceConfig.indentGuides # default false - @ace.setShowInvisibles # default false + @ace.setShowInvisibles aceConfig.invisibles # default false @ace.setKeyboardHandler @keyBindings[aceConfig.keyBindings ? 'default'] @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] + onChangeLanguage: (e) -> + aceConfig = me.get 'aceConfig' + @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] + dismiss: -> @recompile() if @spell.hasChangedSignificantly @getSource() diff --git a/app/views/play/level/tome/tome_view.coffee b/app/views/play/level/tome/tome_view.coffee index 9640a98d0..8e0d9ac12 100644 --- a/app/views/play/level/tome/tome_view.coffee +++ b/app/views/play/level/tome/tome_view.coffee @@ -48,6 +48,7 @@ module.exports = class TomeView extends View 'tome:spell-loaded': "onSpellLoaded" 'tome:cast-spell': "onCastSpell" 'tome:toggle-spell-list': 'onToggleSpellList' + 'tome:change-language': 'updateLanguageForAllSpells' 'surface:sprite-selected': 'onSpriteSelected' 'god:new-world-created': 'onNewWorld' @@ -217,6 +218,9 @@ module.exports = class TomeView extends View spell.view.reloadCode false for spellKey, spell of @spells Backbone.Mediator.publish 'tome:cast-spells', spells: @spells + updateLanguageForAllSpells: -> + spell.updateLanguageAether for spellKey, spell of @spells + destroy: -> spell.destroy() for spellKey, spell of @spells @worker?._close() From b5aee8d6918b0a0aa99fa38ac4c5fce898827f34 Mon Sep 17 00:00:00 2001 From: Dominik Kundel Date: Tue, 18 Mar 2014 00:15:39 +0100 Subject: [PATCH 4/7] support new version of aether' --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 231d6e1c7..8b36df523 100644 --- a/bower.json +++ b/bower.json @@ -32,7 +32,7 @@ "firepad": "~0.1.2", "marked": "~0.3.0", "moment": "~2.5.0", - "aether": "~0.1.10", + "aether": "~0.1.13", "underscore.string": "~2.3.3", "firebase": "~1.0.2", "catiline": "~2.9.3" From 267d03399706e29dc08a5927d5ee8033a8ae382f Mon Sep 17 00:00:00 2001 From: Dominik Kundel Date: Fri, 28 Mar 2014 14:42:08 +0100 Subject: [PATCH 5/7] initial coffeescript support. No proper highlighting of executing parts and errors are not displayed inline --- app/views/play/level/modal/editor_config_modal.coffee | 2 +- app/views/play/level/tome/spell.coffee | 4 ++-- app/views/play/level/tome/spell_view.coffee | 8 ++++---- app/views/play/level/tome/tome_view.coffee | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/play/level/modal/editor_config_modal.coffee b/app/views/play/level/modal/editor_config_modal.coffee index 6eee66071..6be98b44d 100644 --- a/app/views/play/level/modal/editor_config_modal.coffee +++ b/app/views/play/level/modal/editor_config_modal.coffee @@ -62,7 +62,7 @@ module.exports = class EditorConfigModal extends View @aceConfig.behaviors = @$el.find('#tome-behaviors').prop('checked') me.set 'aceConfig', @aceConfig Backbone.Mediator.publish 'tome:change-config' - Backbone.Mediator.publish 'tome:change-language' unless @aceConfig.language is oldLanguage + Backbone.Mediator.publish 'tome:change-language' unless @aceConfig.language isnt oldLanguage me.save() destroy: -> diff --git a/app/views/play/level/tome/spell.coffee b/app/views/play/level/tome/spell.coffee index b18263e9f..a0cb680cb 100644 --- a/app/views/play/level/tome/spell.coffee +++ b/app/views/play/level/tome/spell.coffee @@ -85,7 +85,7 @@ module.exports = class Spell aether.hasChangedSignificantly (newSource ? @originalSource), (currentSource ? @source), true, true createAether: (thang) -> - aceConfig = me.get 'aceConfig' ? {} + aceConfig = me.get('aceConfig') ? {} aetherOptions = problems: jshint_W040: {level: "ignore"} @@ -110,7 +110,7 @@ module.exports = class Spell aether updateLanguageAether: -> - aceConfig = me.get 'aceConfig' ? {} + aceConfig = me.get('aceConfig') ? {} for thangId, spellThang of @thangs spellThang.aether?.setLanguage (aceConfig.language ? 'javascript') spellThang.castAether = null diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/spell_view.coffee index 4319981d8..17a813459 100644 --- a/app/views/play/level/tome/spell_view.coffee +++ b/app/views/play/level/tome/spell_view.coffee @@ -17,7 +17,7 @@ module.exports = class SpellView extends View editModes: 'javascript': 'ace/mode/javascript' - 'coffeescript': 'ace/mode/coffeescript' + 'coffeescript': 'ace/mode/coffee' keyBindings: 'default': null @@ -567,14 +567,14 @@ module.exports = class SpellView extends View @ace.setValue pretty onChangeEditorConfig: (e) -> - aceConfig = me.get 'aceConfig' + aceConfig = me.get('aceConfig') ? {} @ace.setDisplayIndentGuides aceConfig.indentGuides # default false @ace.setShowInvisibles aceConfig.invisibles # default false @ace.setKeyboardHandler @keyBindings[aceConfig.keyBindings ? 'default'] - @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] + # @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] onChangeLanguage: (e) -> - aceConfig = me.get 'aceConfig' + aceConfig = me.get('aceConfig') ? {} @aceSession.setMode @editModes[aceConfig.language ? 'javascript'] dismiss: -> diff --git a/app/views/play/level/tome/tome_view.coffee b/app/views/play/level/tome/tome_view.coffee index a4e3f8c2b..5c92a9bcf 100644 --- a/app/views/play/level/tome/tome_view.coffee +++ b/app/views/play/level/tome/tome_view.coffee @@ -218,7 +218,7 @@ module.exports = class TomeView extends View Backbone.Mediator.publish 'tome:cast-spells', spells: @spells updateLanguageForAllSpells: -> - spell.updateLanguageAether for spellKey, spell of @spells + spell.updateLanguageAether() for spellKey, spell of @spells destroy: -> spell.destroy() for spellKey, spell of @spells From 725a8bc2d9a680bd69f38e6ac98c214a2e9f83d4 Mon Sep 17 00:00:00 2001 From: Dominik Kundel Date: Mon, 31 Mar 2014 20:48:07 +0200 Subject: [PATCH 6/7] updated locales --- app/locale/ar.coffee | 2 ++ app/locale/bg.coffee | 2 ++ app/locale/ca.coffee | 2 ++ app/locale/cs.coffee | 2 ++ app/locale/da.coffee | 2 ++ app/locale/el.coffee | 2 ++ app/locale/en-AU.coffee | 2 ++ app/locale/en-GB.coffee | 2 ++ app/locale/en-US.coffee | 2 ++ app/locale/es-419.coffee | 2 ++ app/locale/es-ES.coffee | 2 ++ app/locale/es.coffee | 2 ++ app/locale/fa.coffee | 2 ++ app/locale/fi.coffee | 2 ++ app/locale/fr.coffee | 2 ++ app/locale/he.coffee | 2 ++ app/locale/hi.coffee | 2 ++ app/locale/hu.coffee | 2 ++ app/locale/id.coffee | 2 ++ app/locale/it.coffee | 2 ++ app/locale/ja.coffee | 2 ++ app/locale/ko.coffee | 2 ++ app/locale/lt.coffee | 2 ++ app/locale/ms.coffee | 2 ++ app/locale/nb.coffee | 2 ++ app/locale/nl-BE.coffee | 2 ++ app/locale/nl-NL.coffee | 2 ++ app/locale/nl.coffee | 2 ++ app/locale/nn.coffee | 2 ++ app/locale/no.coffee | 2 ++ app/locale/pl.coffee | 2 ++ app/locale/pt-BR.coffee | 2 ++ app/locale/pt-PT.coffee | 2 ++ app/locale/pt.coffee | 2 ++ app/locale/ro.coffee | 2 ++ app/locale/ru.coffee | 2 ++ app/locale/sk.coffee | 2 ++ app/locale/sl.coffee | 2 ++ app/locale/sr.coffee | 2 ++ app/locale/sv.coffee | 2 ++ app/locale/th.coffee | 2 ++ app/locale/tr.coffee | 2 ++ app/locale/uk.coffee | 2 ++ app/locale/ur.coffee | 2 ++ app/locale/vi.coffee | 2 ++ app/locale/zh-HANS.coffee | 2 ++ app/locale/zh-HANT.coffee | 2 ++ app/locale/zh.coffee | 2 ++ 48 files changed, 96 insertions(+) diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee index b61580832..e60d15634 100644 --- a/app/locale/ar.coffee +++ b/app/locale/ar.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee index bf28857cb..e3d81541e 100644 --- a/app/locale/bg.coffee +++ b/app/locale/bg.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "български език", englishDescri # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee index 595ac7bb3..b46a170ae 100644 --- a/app/locale/ca.coffee +++ b/app/locale/ca.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee index d69702f93..c22be8eb8 100644 --- a/app/locale/cs.coffee +++ b/app/locale/cs.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/da.coffee b/app/locale/da.coffee index 200d6c873..4160b82e6 100644 --- a/app/locale/da.coffee +++ b/app/locale/da.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans skip_tutorial: "Spring over (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Tastaturgenveje" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/el.coffee b/app/locale/el.coffee index 1741ad6f3..41bc54831 100644 --- a/app/locale/el.coffee +++ b/app/locale/el.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee index a4938fc7a..e37b266e4 100644 --- a/app/locale/en-AU.coffee +++ b/app/locale/en-AU.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee index 9adacaab0..d8c86e6f9 100644 --- a/app/locale/en-GB.coffee +++ b/app/locale/en-GB.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee index 6e8a79b62..413aa4420 100644 --- a/app/locale/en-US.coffee +++ b/app/locale/en-US.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee index b00e98d03..9146126b2 100644 --- a/app/locale/es-419.coffee +++ b/app/locale/es-419.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee index 79d4e8ef0..ee805a94b 100644 --- a/app/locale/es-ES.coffee +++ b/app/locale/es-ES.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/es.coffee b/app/locale/es.coffee index 8a59ff812..e9bff10b8 100644 --- a/app/locale/es.coffee +++ b/app/locale/es.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t skip_tutorial: "Saltar (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee index d91e19e22..00edabd61 100644 --- a/app/locale/fa.coffee +++ b/app/locale/fa.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian", # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee index c750083fe..1416eb980 100644 --- a/app/locale/fi.coffee +++ b/app/locale/fi.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee index 7b0eae3b0..0a017425c 100644 --- a/app/locale/fr.coffee +++ b/app/locale/fr.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t skip_tutorial: "Passer (esc)" editor_config: "Config de l'éditeur" editor_config_title: "Configuration de l'éditeur" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Raccourcis clavier" editor_config_keybindings_default: "Par défault (Ace)" editor_config_keybindings_description: "Ajouter de nouveaux raccourcis connus depuis l'éditeur commun." diff --git a/app/locale/he.coffee b/app/locale/he.coffee index e3966af95..c8177b5e8 100644 --- a/app/locale/he.coffee +++ b/app/locale/he.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew", # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee index 406135762..f6a15c9d6 100644 --- a/app/locale/hi.coffee +++ b/app/locale/hi.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee index e162d61f6..e4ffde806 100644 --- a/app/locale/hu.coffee +++ b/app/locale/hu.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/id.coffee b/app/locale/id.coffee index 1c9b3b97e..68ec73817 100644 --- a/app/locale/id.coffee +++ b/app/locale/id.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/it.coffee b/app/locale/it.coffee index 0206d742d..5c4acdfcd 100644 --- a/app/locale/it.coffee +++ b/app/locale/it.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t skip_tutorial: "Salta (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee index 0d2286c8f..798f9ec2b 100644 --- a/app/locale/ja.coffee +++ b/app/locale/ja.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese", # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee index cac92fa8d..ded7538f9 100644 --- a/app/locale/ko.coffee +++ b/app/locale/ko.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t skip_tutorial: "넘기기 (esc)" editor_config: "에디터 설정" editor_config_title: "에디터 설정" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "단축키 설정" editor_config_keybindings_default: "기본(Ace)" editor_config_keybindings_description: "일반적인 에디터와 마찬가지인 단축키 설정" diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee index 962c8ee6b..8b1d53ce8 100644 --- a/app/locale/lt.coffee +++ b/app/locale/lt.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee index 6be2a2396..a30eca215 100644 --- a/app/locale/ms.coffee +++ b/app/locale/ms.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee index 19cefee72..f121e47cd 100644 --- a/app/locale/nb.coffee +++ b/app/locale/nb.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee index b790f13da..180a31782 100644 --- a/app/locale/nl-BE.coffee +++ b/app/locale/nl-BE.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription: skip_tutorial: "Overslaan (esc)" editor_config: "Editor Configuratie" editor_config_title: "Editor Configuratie" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Toets instellingen" # editor_config_keybindings_default: "Default (Ace)" editor_config_keybindings_description: "Voeg extra shortcuts toe van de gebruikelijke editors." diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee index f813bc8aa..dba0c2e58 100644 --- a/app/locale/nl-NL.coffee +++ b/app/locale/nl-NL.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription skip_tutorial: "Overslaan (esc)" editor_config: "Editor Configuratie" editor_config_title: "Editor Configuratie" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Toets instellingen" # editor_config_keybindings_default: "Default (Ace)" editor_config_keybindings_description: "Voeg extra shortcuts toe van de gebruikelijke editors." diff --git a/app/locale/nl.coffee b/app/locale/nl.coffee index e2de4d9df..4c07b17cd 100644 --- a/app/locale/nl.coffee +++ b/app/locale/nl.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t skip_tutorial: "Overslaan (esc)" editor_config: "Editor Configuratie" editor_config_title: "Editor Configuratie" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Toets instellingen" editor_config_keybindings_default: "Standaard (Ace)" editor_config_keybindings_description: "Voeg extra shortcuts toe van de gebruikelijke editors." diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee index 22f12947f..1923342fd 100644 --- a/app/locale/nn.coffee +++ b/app/locale/nn.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/no.coffee b/app/locale/no.coffee index 2b401c494..14947aede 100644 --- a/app/locale/no.coffee +++ b/app/locale/no.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee index d8d4f85ec..2ad3de6bc 100644 --- a/app/locale/pl.coffee +++ b/app/locale/pl.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish skip_tutorial: "Pomiń (esc)" editor_config: "Konfiguracja edytora" editor_config_title: "Konfiguracja edytora" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Przypisania klawiszy" editor_config_keybindings_default: "Domyślny (Ace)" editor_config_keybindings_description: "Dodaje skróty znane z popularnych edytorów." diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee index 3802d0956..2add83019 100644 --- a/app/locale/pt-BR.coffee +++ b/app/locale/pt-BR.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "português do Brasil", englishDescription: skip_tutorial: "Pular (esc)" editor_config: "Editor de Configurações" editor_config_title: "Editor de Configurações" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Teclas de Atalho" editor_config_keybindings_default: "Padrão (Ace)" editor_config_keybindings_description: "Adicionar atalhos conhecidos de editores comuns." diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee index d6744433c..cfe772200 100644 --- a/app/locale/pt-PT.coffee +++ b/app/locale/pt-PT.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P skip_tutorial: "Saltar (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/pt.coffee b/app/locale/pt.coffee index 7008fc8fb..40db0faf2 100644 --- a/app/locale/pt.coffee +++ b/app/locale/pt.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee index 789bd1159..6de99731d 100644 --- a/app/locale/ro.coffee +++ b/app/locale/ro.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman skip_tutorial: "Sari peste (esc)" editor_config: "Editor Config" editor_config_title: "Configurare Editor" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Mapare taste" editor_config_keybindings_default: "Default (Ace)" editor_config_keybindings_description: "Adaugă comenzi rapide suplimentare cunoscute din editoarele obisnuite." diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee index 9d1ec2d22..863a198a8 100644 --- a/app/locale/ru.coffee +++ b/app/locale/ru.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi skip_tutorial: "Пропуск (Esc)" editor_config: "Настройки редактора" editor_config_title: "Настройки редактора" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Сочетания клавиш" editor_config_keybindings_default: "По умолчанию (Ace)" editor_config_keybindings_description: "Добавляет дополнительные сочетания, известные из популярных редакторов." diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee index 4c58049a7..82fc815bc 100644 --- a/app/locale/sk.coffee +++ b/app/locale/sk.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak", # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee index 56cbd080b..96077ec66 100644 --- a/app/locale/sl.coffee +++ b/app/locale/sl.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee index 0437de30c..4813f0332 100644 --- a/app/locale/sr.coffee +++ b/app/locale/sr.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee index 577ffb5bc..11111d753 100644 --- a/app/locale/sv.coffee +++ b/app/locale/sv.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr skip_tutorial: "Hoppa över (esc)" editor_config: "Ställ in redigerare" editor_config_title: "Redigerarinställningar" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." editor_config_keybindings_label: "Kortkommandon" editor_config_keybindings_default: "Standard (Ace)" editor_config_keybindings_description: "Lägger till ytterligare kortkommandon kända från vanliga redigerare." diff --git a/app/locale/th.coffee b/app/locale/th.coffee index f7155c267..b3363721f 100644 --- a/app/locale/th.coffee +++ b/app/locale/th.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee index e1cc00b36..b22c2b398 100644 --- a/app/locale/tr.coffee +++ b/app/locale/tr.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee index c0c9b4076..b4a9ad3a2 100644 --- a/app/locale/uk.coffee +++ b/app/locale/uk.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "українська мова", englishDesc skip_tutorial: "Пропустити (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" editor_config_keybindings_default: "За замовчуванням (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee index 923fb3fe4..a956b6548 100644 --- a/app/locale/ur.coffee +++ b/app/locale/ur.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu", # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee index d5d563f7a..0add0379b 100644 --- a/app/locale/vi.coffee +++ b/app/locale/vi.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee index 946a003a9..e87c93d4a 100644 --- a/app/locale/zh-HANS.coffee +++ b/app/locale/zh-HANS.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese skip_tutorial: "跳过（esc）" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee index 8c761d5a3..d9eba52d0 100644 --- a/app/locale/zh-HANT.coffee +++ b/app/locale/zh-HANT.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." diff --git a/app/locale/zh.coffee b/app/locale/zh.coffee index b6e955925..2cff55f8d 100644 --- a/app/locale/zh.coffee +++ b/app/locale/zh.coffee @@ -224,6 +224,8 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra # skip_tutorial: "Skip (esc)" # editor_config: "Editor Config" # editor_config_title: "Editor Configuration" +# editor_config_language_label: "Programming Language" +# editor_config_language_description: "Define the programming language you want to code in." # editor_config_keybindings_label: "Key Bindings" # editor_config_keybindings_default: "Default (Ace)" # editor_config_keybindings_description: "Adds additional shortcuts known from the common editors." From 62b63870909461d674b8f69e6ac47a4ca47bd868 Mon Sep 17 00:00:00 2001 From: Dominik Kundel Date: Mon, 31 Mar 2014 20:53:28 +0200 Subject: [PATCH 7/7] updated aether dependency to support coffeescript --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index b499ee391..3fe74b87c 100644 --- a/bower.json +++ b/bower.json @@ -32,7 +32,7 @@ "firepad": "~0.1.2", "marked": "~0.3.0", "moment": "~2.5.0", - "aether": "~0.1.14", + "aether": "~0.1.17", "underscore.string": "~2.3.3", "firebase": "~1.0.2", "catiline": "~2.9.3"