Ticket #4219: 4219_2.patch

_source/core/lang.js

@@ -92 +92 @@
                  */
                 load : function( languageCode, defaultLanguage, callback )
                 {
-                        if ( !languageCode )
-                                languageCode = this.detect( defaultLanguage );
+                        // If no languageCode - fallback to browser or default.
+                        // If languageCode - fallback to no-localized version or default.
+                        if ( !languageCode || !CKEDITOR.lang[ languageCode ] )
+                                languageCode = this.detect( defaultLanguage, languageCode );
 
                         if ( !this[ languageCode ] )
                         {
@@ -122 +124 @@
                  * @example
                  * alert( CKEDITOR.lang.detect( 'en' ) );  // e.g., in a German browser: "de"
                  */
-                detect : function( defaultLanguage )
+                detect : function( defaultLanguage, probeLanguage )
                 {
                         var languages = this.languages;
+                        probeLanguage = probeLanguage || navigator.userLanguage || navigator.language;
 
-                        var parts = ( navigator.userLanguage || navigator.language )
+                        var parts = probeLanguage
                                         .toLowerCase()
                                         .match( /([a-z]+)(?:-([a-z]+))?/ ),
                                 lang = parts[1],

CHANGES.html

@@ -47 +47 @@
                 <li></li>
         </ul>
         <h3>
+                CKEditor 3.1</h3>
+        <p>
+                New features:</p>
+        <ul>
+                <li><a href="http://dev.fckeditor.net/ticket/4219">#4219</a> : Added fallback mechanism needed for config.language.</li>
+        </ul>
+        <p>
+                Fixed issues:</p>
+        <ul>
+        </ul>
+        <h3>
                 CKEditor 3.0</h3>
         <p>
                 New features:</p>