vanilla ckeditor-3.5.3

[ckeditor.git] / _source / core / editor.js

diff --git a/_source/core/editor.js b/_source/core/editor.js
index d66aac9..352c4b2 100644 (file)
--- a/_source/core/editor.js
+++ b/_source/core/editor.js
@@ -272,7 +272,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                // is not available, get the first one (default one).\r
                                                lang = ( CKEDITOR.tools.indexOf( pluginLangs, editor.langCode ) >= 0 ? editor.langCode : pluginLangs[ 0 ] );\r
 \r
-                                               if ( !plugin.lang[ lang ] )\r
+                                               if ( !plugin.langEntries || !plugin.langEntries[ lang ] )\r
                                                {\r
                                                        // Put the language file URL into the list of files to\r
                                                        // get downloaded.\r
@@ -280,7 +280,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                }\r
                                                else\r
                                                {\r
-                                                       CKEDITOR.tools.extend( editor.lang, plugin.lang[ lang ] );\r
+                                                       CKEDITOR.tools.extend( editor.lang, plugin.langEntries[ lang ] );\r
                                                        lang = null;\r
                                                }\r
                                        }\r
@@ -305,7 +305,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
                                                                // Uses the first loop to update the language entries also.\r
                                                                if ( m === 0 && languageCodes[ i ] && plugin.lang )\r
-                                                                       CKEDITOR.tools.extend( editor.lang, plugin.lang[ languageCodes[ i ] ] );\r
+                                                                       CKEDITOR.tools.extend( editor.lang, plugin.langEntries[ languageCodes[ i ] ] );\r
 \r
                                                                // Call the plugin method (beforeInit and init).\r
                                                                if ( plugin[ methods[ m ] ] )\r