Ticket #3225: 3225.patch

_source/core/config.js

@@ -77 +77 @@
         contentsLangDirection : 'ltr',
 
         /**
-         * Instructs the editor to automatically localize the editor to the user
-         * language, if possible. If set to false, the [@link #defaultLanguage]
-         * language is used.
+         * The user interface language localization to use. If empty, the editor
+         * automatically localize the editor to the user language, if supported,
+         * otherwise the [@link #defaultLanguage] language is used.
          * @default true
          * @type Boolean
          * @example
-         * // Forces the editor to always load the German interface.
-         * config.autoLanguage = false;
-         * config.defaultLanguage = 'de';
+         * // Load the German interface.
+         * config.language = 'de';
          */
-        autoLanguage : true,
+        language : '',
 
         /**
          * The language to be used if [@link #autoLanguage] is set to false, or

_source/core/editor.js

@@ -130 +130 @@
 
         var loadLang = function( editor )
         {
-                CKEDITOR.lang.load( editor.config.defaultLanguage, editor.config.autoLanguage, function( languageCode, lang )
+                CKEDITOR.lang.load( editor.config.language, editor.config.defaultLanguage, function( languageCode, lang )
                         {
                                 editor.langCode = languageCode;
 

_source/core/lang.js

@@ -90 +90 @@
                  *              function: the language code and the loaded language entries.
                  * @example
                  */
-                load : function( languageCode, autoDetect, callback )
+                load : function( languageCode, defaultLanguage, callback )
                 {
-                        if ( autoDetect )
-                                languageCode = this.detect( languageCode );
+                        if ( !languageCode )
+                                languageCode = this.detect( defaultLanguage );
 
                         if ( !this[ languageCode ] )
                         {