Ticket #1032: 1032.patch

_source/core/editor.js

@@ -143 +143 @@
                                 if ( CKEDITOR.env.gecko && CKEDITOR.env.version < 10900 && editor.lang.dir == 'rtl' )
                                         editor.lang.dir = 'ltr';
 
+                                // Override language file entries with custom textes.
+                                if ( editor.config.lang )
+                                {
+                                        for ( var entry in editor.config.lang )
+                                        {
+                                                if ( editor.config.lang[ entry ] instanceof Object && CKEDITOR.lang[ entry ] )  // Language code.
+                                                        CKEDITOR.tools.extend( CKEDITOR.lang[ entry ], editor.config.lang[ entry ], true );
+                                                else    // Current language only.
+                                                {
+                                                        if ( CKEDITOR.lang[ languageCode ] )
+                                                                CKEDITOR.lang[ editor.langCode ][ entry ] = editor.config.lang[ entry ];        // Override the translation.
+                                                }
+                                        }
+                                }
+                                delete editor.config.lang;
+
                                 loadPlugins( editor );
                         });
         };