BUGFIX: Fix mismatch with $all_locales and $common_locales (#5096)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100406 467b73ca-7a2a-4603-9d3b-597d59a354a9

core/i18n.php

@@ -141,16 +141,16 @@ class i18n extends Object {
 			'az_IR' => 'Azerbaijani (Iran)',
 			'ba_RU' => 'Bashkir (Russia)',
 			'ban_ID' => 'Balinese (Indonesia)',
+			'bcc_PK' => 'Balochi, Southern (Pakistan)',
+			'bcl_PH' => 'Bicolano, Central (Philippines)',
 			'be_BY' => 'Belarusian (Belarus)',
 			'bew_ID' => 'Betawi (Indonesia)',
 			'bg_BG' => 'Bulgarian (Bulgaria)',
 			'bgc_IN' => 'Haryanvi (India)',
-		'bcc_PK' => 'Balochi, Southern (Pakistan)',
 			'bgn_PK' => 'Balochi, Western (Pakistan)',
 			'bgp_PK' => 'Balochi, Easter (Pakistan)',
 			'bhb_IN' => 'Bhili (India)',
 			'bhi_IN' => 'Bhilali (India)',
-		'bcl_PH' => 'Bicolano, Central (Philippines)',
 			'bhk_PH' => 'Bicolano, Albay (Philippines)',
 			'bho_IN' => 'Bhojpuri (India)',
 			'bho_MU' => 'Bhojpuri (Mauritius)',
@@ -176,8 +176,8 @@ class i18n extends Object {
 			'ch_GU' => 'Chamorro (Guam)',
 			'chk_FM' => 'Chuukese (Micronesia)',
 			'crk_CA' => 'Cree, Plains (Canada)',
-		'cwd_CA' => 'Cree, Woods (Canada)',
 			'cs_CZ' => 'Czech (Czech Republic)',
+			'cwd_CA' => 'Cree, Woods (Canada)',
 			'cy_GB' => 'Welsh (United Kingdom)',
 			'da_DK' => 'Danish (Denmark)',
 			'da_GL' => 'Danish (Greenland)',
@@ -202,27 +202,27 @@ class i18n extends Object {
 			'en_BM' => 'English (Bermuda)',
 			'en_BS' => 'English (Bahamas)',
 			'en_CA' => 'English (Canada)',
+			'en_DE' => 'English (Germany)',
+			'en_ES' => 'English (Spain)',
+			'en_FR' => 'English (France)',
 			'en_GB' => 'English (United Kingdom)',
 			'en_HK' => 'English (Hong Kong SAR China)',
 			'en_IE' => 'English (Ireland)',
 			'en_IN' => 'English (India)',
+			'en_IT' => 'English (Italy)',
 			'en_JM' => 'English (Jamaica)',
 			'en_KE' => 'English (Kenya)',
 			'en_LR' => 'English (Liberia)',
 			'en_MM' => 'English (Myanmar)',
 			'en_MW' => 'English (Malawi)',
 			'en_MY' => 'English (Malaysia)',
+			'en_NL' => 'English (Netherlands)',
 			'en_NZ' => 'English (New Zealand)',
 			'en_PH' => 'English (Philippines)',
 			'en_SG' => 'English (Singapore)',
 			'en_TT' => 'English (Trinidad and Tobago)',
 			'en_US' => 'English (United States)',
 			'en_ZA' => 'English (South Africa)',
-		'en_DE' => 'English (Germany)',
-		'en_ES' => 'English (Spain)',
-		'en_FR' => 'English (France)',
-		'en_IT' => 'English (Italy)',
-		'en_NL' => 'English (Netherlands)',
 			'eo_XX' => 'Esperanto',
 			'es_419' => 'Spanish (Latin America)',
 			'es_AR' => 'Spanish (Argentina)',
@@ -281,8 +281,8 @@ class i18n extends Object {
 			'fr_SN' => 'French (Senegal)',
 			'fr_US' => 'French (United States)',
 			'fuv_NG' => 'Fulfulde (Nigeria)',
-		'ga_IE' => 'Irish (Ireland)',
 			'ga_GB' => 'Irish (United Kingdom)',
+			'ga_IE' => 'Irish (Ireland)',
 			'gaa_GH' => 'Ga (Ghana)',
 			'gbm_IN' => 'Garhwali (India)',
 			'gcr_GF' => 'Guianese Creole French (French Guiana)',
@@ -296,8 +296,8 @@ class i18n extends Object {
 			'gsw_LI' => 'Swiss German (Liechtenstein)',
 			'gu_IN' => 'Gujarati (India)',
 			'guz_KE' => 'Gusii (Kenya)',
-		'ha_NG' => 'Hausa (Nigeria)',
 			'ha_NE' => 'Hausa (Niger)',
+			'ha_NG' => 'Hausa (Nigeria)',
 			'haw_US' => 'Hawaiian (United States)',
 			'haz_AF' => 'Hazaragi (Afghanistan)',
 			'he_IL' => 'Hebrew (Israel)',
@@ -306,12 +306,12 @@ class i18n extends Object {
 			'hne_IN' => 'Chhattisgarhi (India)',
 			'hno_PK' => 'Hindko, Northern (Pakistan)',
 			'hoc_IN' => 'Ho (India)',
+			'hr_AT' => 'Croatian (Austria)',
 			'hr_BA' => 'Croatian (Bosnia and Herzegovina)',
 			'hr_HR' => 'Croatian (Croatia)',
-		'hr_AT' => 'Croatian (Austria)',
 			'ht_HT' => 'Haitian (Haiti)',
-		'hu_HU' => 'Hungarian (Hungary)',
 			'hu_AT' => 'Hungarian (Austria)',
+			'hu_HU' => 'Hungarian (Hungary)',
 			'hu_RO' => 'Hungarian (Romania)',
 			'hu_RS' => 'Hungarian (Serbia)',
 			'hy_AM' => 'Armenian (Armenia)',
@@ -321,10 +321,10 @@ class i18n extends Object {
 			'inh_RU' => 'Ingush (Russia)',
 			'is_IS' => 'Icelandic (Iceland)',
 			'it_CH' => 'Italian (Switzerland)',
-		'it_IT' => 'Italian (Italy)',
-		'it_SM' => 'Italian (San Marino)',
 			'it_FR' => 'Italian (France)',
 			'it_HR' => 'Italian (Croatia)',
+			'it_IT' => 'Italian (Italy)',
+			'it_SM' => 'Italian (San Marino)',
 			'it_US' => 'Italian (United States)',
 			'iu_CA' => 'Inuktitut (Canada)',
 			'ja_JP' => 'Japanese (Japan)',
@@ -337,10 +337,10 @@ class i18n extends Object {
 			'khn_IN' => 'Khandesi (India)',
 			'ki_KE' => 'Kikuyu (Kenya)',
 			'kj_NA' => 'Kuanyama (Namibia)',
-		'kk_KZ' => 'Kazakh (Kazakhstan)',
 			'kk_CN' => 'Kazakh (China)',
-		'kl_GL' => 'Kalaallisut (Greenland)',
+			'kk_KZ' => 'Kazakh (Kazakhstan)',
 			'kl_DK' => 'Kalaallisut (Denmark)',
+			'kl_GL' => 'Kalaallisut (Greenland)',
 			'kln_KE' => 'Kalenjin (Kenya)',
 			'km_KH' => 'Khmer (Cambodia)',
 			'kn_IN' => 'Kannada (India)',
@@ -393,15 +393,15 @@ class i18n extends Object {
 			'min_ID' => 'Minangkabau (Indonesia)',
 			'mk_MK' => 'Macedonian (Macedonia)',
 			'ml_IN' => 'Malayalam (India)',
-		'mn_MN' => 'Mongolian (Mongolia)',
 			'mn_CN' => 'Mongolian (China)',
+			'mn_MN' => 'Mongolian (Mongolia)',
 			'mni_IN' => 'Manipuri (India)',
 			'mr_IN' => 'Marathi (India)',
 			'ms_BN' => 'Malay (Brunei)',
-		'ms_MY' => 'Malay (Malaysia)',
-		'ms_SG' => 'Malay (Singapore)',
 			'ms_CC' => 'Malay (Cocos Islands)',
 			'ms_ID' => 'Malay (Indonesia)',
+			'ms_MY' => 'Malay (Malaysia)',
+			'ms_SG' => 'Malay (Singapore)',
 			'mt_MT' => 'Maltese (Malta)',
 			'mtr_IN' => 'Mewari (India)',
 			'mup_IN' => 'Malvi (India)',
@@ -413,8 +413,8 @@ class i18n extends Object {
 			'nb_SJ' => 'Norwegian Bokmal (Svalbard and Jan Mayen)',
 			'nd_ZW' => 'North Ndebele (Zimbabwe)',
 			'ndc_MZ' => 'Ndau (Mozambique)',
-		'ne_NP' => 'Nepali (Nepal)',
 			'ne_IN' => 'Nepali (India)',
+			'ne_NP' => 'Nepali (Nepal)',
 			'ng_NA' => 'Ndonga (Namibia)',
 			'ngl_MZ' => 'Lomwe (Mozambique)',
 			'niu_NU' => 'Niuean (Niue)',
@@ -424,6 +424,7 @@ class i18n extends Object {
 			'nl_NL' => 'Dutch (Netherlands)',
 			'nl_SR' => 'Dutch (Suriname)',
 			'nn_NO' => 'Norwegian Nynorsk (Norway)',
+			'no_NO' => 'Norwegian',
 			'nod_TH' => 'Thai, Northern (Thailand)',
 			'noe_IN' => 'Nimadi (India)',
 			'nso_ZA' => 'Northern Sotho (South Africa)',
@@ -475,22 +476,23 @@ class i18n extends Object {
 			'sat_IN' => 'Santali (India)',
 			'sck_IN' => 'Sadri (India)',
 			'sco_GB' => 'Scots (United Kingdom)',
+			'sco_SCO' => 'Scots',
 			'sd_IN' => 'Sindhi (India)',
 			'sd_PK' => 'Sindhi (Pakistan)',
 			'se_NO' => 'Northern Sami (Norway)',
 			'sg_CF' => 'Sango (Central African Republic)',
 			'si_LK' => 'Sinhalese (Sri Lanka)',
 			'sid_ET' => 'Sidamo (Ethiopia)',
-		'sk_SK' => 'Slovak (Slovakia)',
 			'sk_RS' => 'Slovak (Serbia)',
-		'sl_SI' => 'Slovenian (Slovenia)',
+			'sk_SK' => 'Slovak (Slovakia)',
 			'sl_AT' => 'Slovenian (Austria)',
+			'sl_SI' => 'Slovenian (Slovenia)',
 			'sm_AS' => 'Samoan (American Samoa)',
 			'sm_WS' => 'Samoan (Samoa)',
 			'sn_ZW' => 'Shona (Zimbabwe)',
-		'so_SO' => 'Somali (Somalia)',
 			'so_DJ' => 'Somali (Djibouti)',
 			'so_ET' => 'Somali (Ethiopia)',
+			'so_SO' => 'Somali (Somalia)',
 			'sou_TH' => 'Thai, Southern (Thailand)',
 			'sq_AL' => 'Albanian (Albania)',
 			'sr_BA' => 'Serbian (Bosnia and Herzegovina)',
@@ -505,16 +507,16 @@ class i18n extends Object {
 			'sv_FI' => 'Swedish (Finland)',
 			'sv_SE' => 'Swedish (Sweden)',
 			'sw_KE' => 'Swahili (Kenya)',
+			'sw_SO' => 'Swahili (Somalia)',
 			'sw_TZ' => 'Swahili (Tanzania)',
 			'sw_UG' => 'Swahili (Uganda)',
-		'sw_SO' => 'Swahili (Somalia)',
 			'swb_KM' => 'Comorian (Comoros)',
 			'swb_YT' => 'Comorian (Mayotte)',
 			'swv_IN' => 'Shekhawati (India)',
 			'ta_IN' => 'Tamil (India)',
 			'ta_LK' => 'Tamil (Sri Lanka)',
-		'ta_SG' => 'Tamil (Singapore)',
 			'ta_MY' => 'Tamil (Malaysia)',
+			'ta_SG' => 'Tamil (Singapore)',
 			'tcy_IN' => 'Tulu (India)',
 			'te_IN' => 'Telugu (India)',
 			'tet_TL' => 'Tetum (East Timor)',
@@ -522,8 +524,8 @@ class i18n extends Object {
 			'th_TH' => 'Thai (Thailand)',
 			'ti_ER' => 'Tigrinya (Eritrea)',
 			'ti_ET' => 'Tigrinya (Ethiopia)',
-		'tk_TM' => 'Turkmen (Turkmenistan)',
 			'tk_IR' => 'Turkmen (Iran)',
+			'tk_TM' => 'Turkmen (Turkmenistan)',
 			'tkl_TK' => 'Tokelau (Tokelau)',
 			'tl_PH' => 'Tagalog (Philippines)',
 			'tl_US' => 'Tagalog (United States)',
@@ -531,11 +533,11 @@ class i18n extends Object {
 			'tn_ZA' => 'Tswana (South Africa)',
 			'to_TO' => 'Tonga (Tonga)',
 			'tr_CY' => 'Turkish (Cyprus)',
-		'tr_TR' => 'Turkish (Turkey)',
 			'tr_DE' => 'Turkish (Germany)',
 			'tr_MK' => 'Turkish (Macedonia)',
-		'ts_ZA' => 'Tsonga (South Africa)',
+			'tr_TR' => 'Turkish (Turkey)',
 			'ts_MZ' => 'Tsonga (Mozambique)',
+			'ts_ZA' => 'Tsonga (South Africa)',
 			'tsg_PH' => 'Tausug (Philippines)',
 			'tt_RU' => 'Tatar (Russia)',
 			'tts_TH' => 'Thai, Northeastern (Thailand)',
@@ -550,11 +552,11 @@ class i18n extends Object {
 			'uli_FM' => 'Ulithian (Micronesia)',
 			'ur_IN' => 'Urdu (India)',
 			'ur_PK' => 'Urdu (Pakistan)',
-		'uz_UZ' => 'Uzbek (Uzbekistan)',
 			'uz_AF' => 'Uzbek (Afghanistan)',
+			'uz_UZ' => 'Uzbek (Uzbekistan)',
 			've_ZA' => 'Venda (South Africa)',
-		'vi_VN' => 'Vietnamese (Vietnam)',
 			'vi_US' => 'Vietnamese (United States)',
+			'vi_VN' => 'Vietnamese (Vietnam)',
 			'vmw_MZ' => 'Waddar (Mozambique)',
 			'wal_ET' => 'Walamo (Ethiopia)',
 			'war_PH' => 'Waray (Philippines)',
@@ -575,7 +577,9 @@ class i18n extends Object {
 			'zh_SG' => 'Chinese (Singapore)',
 			'zh_TW' => 'Chinese (Taiwan)',
 			'zh_US' => 'Chinese (United States)',
-		'zu_ZA' => 'Zulu (South Africa)',
+			'zh_cmn' => 'Chinese (Mandarin)',
+			'zh_yue' => 'Chinese (Cantonese)',
+			'zu_ZA' => 'Zulu (South Africa)'
 	);
 	
 	/**