From ee4e74880328c0d2dfdc23cb33507fb31bfde7fc Mon Sep 17 00:00:00 2001 From: Saophalkun Ponlu Date: Mon, 11 Oct 2010 04:56:39 +0000 Subject: [PATCH] MINOR: Enable non-default language for tinyMCE, setting language in _config.php didn't work. Thanks for @christian git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111875 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- _config.php | 1 - code/LeftAndMain.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.php b/_config.php index abec1fa3..0e1dcb8f 100644 --- a/_config.php +++ b/_config.php @@ -21,7 +21,6 @@ HtmlEditorConfig::get('cms')->setOptions(array( 'friendly_name' => 'Default CMS', 'priority' => '50', 'mode' => 'none', - 'language' => i18n::get_tinymce_lang(), 'body_class' => 'typography', 'document_base_url' => Director::absoluteBaseURL(), diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 39f87627..fa2f07b5 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -162,6 +162,7 @@ class LeftAndMain extends Controller { // Set default values in the config if missing. These things can't be defined in the config // file because insufficient information exists when that is being processed $htmlEditorConfig = HtmlEditorConfig::get_active(); + $htmlEditorConfig->setOption('language', i18n::get_tinymce_lang()); if(!$htmlEditorConfig->getOption('content_css')) { $cssFiles = 'cms/css/editor.css';