X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Flang.js;h=add998259ed66ccc6a65f7af0f338db76514f9cc;hb=c6e377a02b54abc07129d72b632763c727476a15;hp=6ada788b7ae27fb018d0420003c2c07d524f4782;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git

diff --git a/_source/core/lang.js b/_source/core/lang.js
index 6ada788..add9982 100644
--- a/_source/core/lang.js
+++ b/_source/core/lang.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -24,12 +24,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 			'bs'	: 1,
 			'ca'	: 1,
 			'cs'	: 1,
+			'cy'	: 1,
 			'da'	: 1,
 			'de'	: 1,
 			'el'	: 1,
 			'en-au'	: 1,
 			'en-ca'	: 1,
-			'en-uk'	: 1,
+			'en-gb'	: 1,
 			'en'	: 1,
 			'eo'	: 1,
 			'es'	: 1,
@@ -92,12 +93,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		 */
 		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.languages[ languageCode ] )
+				languageCode = this.detect( defaultLanguage, languageCode );
 
 			if ( !this[ languageCode ] )
 			{
 				CKEDITOR.scriptLoader.load( CKEDITOR.getUrl(
+					'_source/' +	// @Packager.RemoveLine
 					'lang/' + languageCode + '.js' ),
 					function()
 						{
@@ -121,11 +125,12 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 		 * @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],