diff --git a/modules/backend/controllers/EditorPreferences.php b/modules/backend/controllers/EditorPreferences.php index 81e537abc..46ad3efa1 100644 --- a/modules/backend/controllers/EditorPreferences.php +++ b/modules/backend/controllers/EditorPreferences.php @@ -54,8 +54,8 @@ class EditorPreferences extends Controller $this->vars['language'] = 'css'; $this->vars['margin'] = 0; $this->vars['enableBasicAutocompletion'] = $editorSettings->enable_basic_autocompletion; - $this->vars['enableSnippets'] = $editorSettings->enable_snippets; $this->vars['enableLiveAutocompletion'] = $editorSettings->enable_live_autocompletion; + $this->vars['enableSnippets'] = $editorSettings->enable_snippets; $this->vars['displayIndentGuides'] = $editorSettings->display_indent_guides; $this->vars['showPrintMargin'] = $editorSettings->show_print_margin; $this->asExtension('FormController')->update(); diff --git a/modules/backend/controllers/editorpreferences/index.htm b/modules/backend/controllers/editorpreferences/index.htm index be2c93303..05fb57317 100644 --- a/modules/backend/controllers/editorpreferences/index.htm +++ b/modules/backend/controllers/editorpreferences/index.htm @@ -21,11 +21,11 @@ data-tab-size="" data-theme="" data-show-invisibles="" - data-enable-basic-autocompletion="" - data-enable-snippets="" - data-enable-live-autocompletion="" - data-display-indent-guides="" - data-show-print-margin="" + data-enable-basic-autocompletion="" + data-enable-live-autocompletion="" + data-enable-snippets="" + data-display-indent-guides="" + data-show-print-margin="" data-highlight-active-line="" data-use-soft-tabs="" data-show-gutter="" diff --git a/modules/backend/models/EditorPreferences.php b/modules/backend/models/EditorPreferences.php index 883f0efef..05d8aa491 100644 --- a/modules/backend/models/EditorPreferences.php +++ b/modules/backend/models/EditorPreferences.php @@ -32,10 +32,10 @@ class EditorPreferences extends Model $this->show_gutter = $config->get('editor.show_gutter', true); $this->auto_closing = $config->get('editor.auto_closing', true); $this->enable_basic_autocompletion = $config->get('editor.enable_basic_autocompletion', true); - $this->enable_snippets = $config->get('editor.enable_snippets', true); + $this->enable_snippets = $config->get('editor.enable_snippets', true); $this->enable_live_autocompletion = $config->get('editor.enable_live_autocompletion', true); $this->display_indent_guides = $config->get('editor.display_indent_guides', true); - $this->show_print_margin = $config->get('editor.show_print_margin', true); + $this->show_print_margin = $config->get('editor.show_print_margin', true); } public static function applyConfigValues() @@ -53,10 +53,10 @@ class EditorPreferences extends Model $config->set('editor.show_gutter', $settings->show_gutter); $config->set('editor.auto_closing', $settings->auto_closing); $config->set('editor.enable_basic_autocompletion', $settings->enable_basic_autocompletion); - $config->set('editor.editor.enable_snippets', $settings->enable_snippets); + $config->set('editor.editor.enable_snippets', $settings->enable_snippets); $config->set('editor.enable_live_autocompletion', $settings->enable_live_autocompletion); $config->set('editor.display_indent_guides', $settings->display_indent_guides); - $config->set('editor.show_print_margin', $settings->show_print_margin); + $config->set('editor.show_print_margin', $settings->show_print_margin); } public function getThemeOptions() diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php index 3061e8f34..ecbd78979 100644 --- a/modules/cms/lang/en/lang.php +++ b/modules/cms/lang/en/lang.php @@ -167,7 +167,7 @@ return [ 'exit_fullscreen' => 'Exit fullscreen mode', 'open_searchbox' => 'Open Search box', 'close_searchbox' => 'Close Search box', - 'open_replacebox' => 'Open Replace box', + 'open_replacebox' => 'Open Replace box', 'close_replacebox' => 'Close Replace box' ], 'asset' => [