Merge branch 't/9688b'

Author: fredck

core/editor.js

@@ -448,8 +448,21 @@
 						pluginLangs = pluginLangs.split( ',' );
 
 					// Resolve the plugin language. If the current language
-					// is not available, get the first one (default one).
-					lang = ( CKEDITOR.tools.indexOf( pluginLangs, editor.langCode ) >= 0 ? editor.langCode : pluginLangs[ 0 ] );
+					// is not available, get English or the first one.
+					if ( CKEDITOR.tools.indexOf( pluginLangs, editor.langCode ) >= 0 )
+						lang = editor.langCode;
+					else {
+						// The language code may have the locale information (zh-cn).
+						// Fall back to locale-less in that case (zh).
+						var langPart = editor.langCode.replace( /-.*/, '' );
+						if ( langPart != editor.langCode && CKEDITOR.tools.indexOf( pluginLangs, langPart ) >= 0 )
+							lang = langPart;
+						// Try the only "generic" option we have: English.
+						else if ( CKEDITOR.tools.indexOf( pluginLangs, 'en' ) >= 0 )
+							lang = 'en';
+						else
+							lang = pluginLangs[ 0 ];
+					}
 
 					if ( !plugin.langEntries || !plugin.langEntries[ lang ] ) {
 						// Put the language file URL into the list of files to

plugins/a11yhelp/plugin.js

@@ -23,7 +23,10 @@
 			editor.addCommand( commandName, {
 				exec: function() {
 					var langCode = editor.langCode;
-					langCode = plugin.availableLangs[ langCode ] ? langCode : 'en';
+					langCode =
+						plugin.availableLangs[ langCode ] ? langCode :
+						plugin.availableLangs[ langCode.replace( /-.*/, '' ) ] ? langCode.replace( /-.*/, '' ) :
+						'en';
 
 					CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( plugin.path + 'dialogs/lang/' + langCode + '.js' ), function() {
 						editor.lang.a11yhelp = plugin.langEntries[ langCode ];

plugins/specialchar/plugin.js

@@ -23,7 +23,10 @@ CKEDITOR.plugins.add( 'specialchar', {
 		editor.addCommand( pluginName, {
 			exec: function() {
 				var langCode = editor.langCode;
-				langCode = plugin.availableLangs[ langCode ] ? langCode : 'en';
+				langCode =
+					plugin.availableLangs[ langCode ] ? langCode :
+					plugin.availableLangs[ langCode.replace( /-.*/, '' ) ] ? langCode.replace( /-.*/, '' ) :
+					'en';
 
 				CKEDITOR.scriptLoader.load( CKEDITOR.getUrl( plugin.path + 'dialogs/lang/' + langCode + '.js' ), function() {
 					CKEDITOR.tools.extend( editor.lang.specialchar, plugin.langEntries[ langCode ] );