Ticket #7088: 7088.patch

_source/core/editor.js

@@ -272 +272 @@
                                                 // is not available, get the first one (default one).
                                                 lang = ( CKEDITOR.tools.indexOf( pluginLangs, editor.langCode ) >= 0 ? editor.langCode : pluginLangs[ 0 ] );
 
-                                                if ( !plugin.lang[ lang ] )
+                                                if ( !plugin.langEntries || !plugin.langEntries[ lang ] )
                                                 {
                                                         // Put the language file URL into the list of files to
                                                         // get downloaded.
@@ -280 +280 @@
                                                 }
                                                 else
                                                 {
-                                                        CKEDITOR.tools.extend( editor.lang, plugin.lang[ lang ] );
+                                                        CKEDITOR.tools.extend( editor.lang, plugin.langEntries[ lang ] );
                                                         lang = null;
                                                 }
                                         }
@@ -305 +305 @@
 
                                                                 // Uses the first loop to update the language entries also.
                                                                 if ( m === 0 && languageCodes[ i ] && plugin.lang )
-                                                                        CKEDITOR.tools.extend( editor.lang, plugin.lang[ languageCodes[ i ] ] );
+                                                                        CKEDITOR.tools.extend( editor.lang, plugin.langEntries[ languageCodes[ i ] ] );
 
                                                                 // Call the plugin method (beforeInit and init).
                                                                 if ( plugin[ methods[ m ] ] )

_source/core/plugins.js

@@ -79 +79 @@
 CKEDITOR.plugins.setLang = function( pluginName, languageCode, languageEntries )
 {
         var plugin = this.get( pluginName ),
-                pluginLang = plugin.lang || ( plugin.lang = {} );
+                pluginLang = plugin.langEntries || ( plugin.langEntries = {} );
 
         pluginLang[ languageCode ] = languageEntries;
 };

_source/plugins/a11yhelp/plugin.js

@@ -32 +32 @@
                                                                 CKEDITOR.getUrl( plugin.path + 'lang/' + langCode + '.js' ),
                                                                 function()
                                                                 {
-                                                                        CKEDITOR.tools.extend( editor.lang, plugin.lang[ langCode ] );
+                                                                        CKEDITOR.tools.extend( editor.lang, plugin.langEntries[ langCode ] );
                                                                         editor.openDialog( commandName );
                                                                 });
                                         },

_source/plugins/specialchar/plugin.js

@@ -31 +31 @@
                                                         CKEDITOR.getUrl( plugin.path + 'lang/' + langCode + '.js' ),
                                                         function()
                                                         {
-                                                                CKEDITOR.tools.extend( editor.lang.specialChar, plugin.lang[ langCode ] );
+                                                                CKEDITOR.tools.extend( editor.lang.specialChar, plugin.langEntries[ langCode ] );
                                                                 editor.openDialog( pluginName );
                                                         });
                                 },