BUGFIX Showing only actually available languages for selection during install (fixes #7260)

dev/install/install.php5

@@ -53,88 +53,62 @@ require_once FRAMEWORK_NAME . '/dev/install/DatabaseAdapterRegistry.php';
 // Set default locale, but try and sniff from the user agent
 $defaultLocale = 'en_US';
 $locales = array(
-	'af_ZA' => array('Afrikaans', 'Afrikaans'),
+  'af_ZA' => 'Afrikaans (South Africa)',
-	'sq_AL' => array('Albanian', 'shqip'),
+  'ar_EG' => 'Arabic (Egypt)',
-	'ar_EG' => array('Arabic', 'العربية'),
+  'hy_AM' => 'Armenian (Armenia)',
-	'eu_ES' => array('Basque', 'euskera'),
+  'ast_ES' => 'Asturian (Spain)',
-	'be_BY' => array('Belarusian', 'Беларуская мова'),
+  'az_AZ' => 'Azerbaijani (Azerbaijan)',
-	'bn_BD' => array('Bengali', 'বাংলা'),
+  'bs_BA' => 'Bosnian (Bosnia and Herzegovina)',
-	'bg_BG' => array('Bulgarian', 'български'),
+  'bg_BG' => 'Bulgarian (Bulgaria)',
-	'ca_ES' => array('Catalan', 'català'),
+  'ca_ES' => 'Catalan (Spain)',
-	'zh_yue' => array('Chinese (Cantonese)', '廣東話 [广东话]'),
+  'zh_CN' => 'Chinese (China)',
-	'zh_cmn' => array('Chinese (Mandarin)', '普通話 [普通话]'),
+  'zh_TW' => 'Chinese (Taiwan)',
-	'hr_HR' => array('Croatian', 'Hrvatski'),
+  'hr_HR' => 'Croatian (Croatia)',
-	'cs_CZ' => array('Czech', 'čeština'),
+  'cs_CZ' => 'Czech (Czech Republic)',
-	'cy_GB' => array('Welsh', 'Welsh/Cymraeg'),
+  'da_DK' => 'Danish (Denmark)',
-	'da_DK' => array('Danish', 'dansk'),
+  'nl_NL' => 'Dutch (Netherlands)',
-	'nl_NL' => array('Dutch', 'Nederlands'),
+  'en_GB' => 'English (United Kingdom)',
-	'en_NZ' => array('English (NZ)', 'English (NZ)'),
+  'en_US' => 'English (United States)',
-	'en_US' => array('English (US)', 'English (US)'),
+  'eo_XX' => 'Esperanto',
-	'en_GB' => array('English (UK)', 'English (UK)'),
+  'et_EE' => 'Estonian (Estonia)',
-	'eo_XX' => array('Esperanto', 'Esperanto'),
+  'fo_FO' => 'Faroese (Faroe Islands)',
-	'et_EE' => array('Estonian', 'eesti keel'),
+  'fi_FI' => 'Finnish (Finland)',
-	'fo_FO' => array('Faroese', 'Føroyska'),
+  'fr_FR' => 'French (France)',
-	'fi_FI' => array('Finnish', 'suomi'),
+  'de_DE' => 'German (Germany)',
-	'fr_FR' => array('French', 'français'),
+  'el_GR' => 'Greek (Greece)',
-	'gd_GB' => array('Gaelic', 'Gaeilge'),
+  'he_IL' => 'Hebrew (Israel)',
-	'gl_ES' => array('Galician', 'Galego'),
+  'hu_HU' => 'Hungarian (Hungary)',
-	'de_DE' => array('German', 'Deutsch'),
+  'is_IS' => 'Icelandic (Iceland)',
-	'el_GR' => array('Greek', 'ελληνικά'),
+  'id_ID' => 'Indonesian (Indonesia)',
-	'gu_IN' => array('Gujarati', 'ગુજરાતી'),
+  'it_IT' => 'Italian (Italy)',
-	'ha_NG' => array('Hausa', 'حَوْسَ'),
+  'ja_JP' => 'Japanese (Japan)',
-	'he_IL' => array('Hebrew', 'עברית'),
+  'km_KH' => 'Khmer (Cambodia)',
-	'hi_IN' => array('Hindi', 'हिन्दी'),
+  'lc_XX' => 'LOLCAT',
-	'hu_HU' => array('Hungarian', 'magyar'),
+  'lv_LV' => 'Latvian (Latvia)',
-	'is_IS' => array('Icelandic', 'Íslenska'),
+  'lt_LT' => 'Lithuanian (Lithuania)',
-	'id_ID' => array('Indonesian', 'Bahasa Indonesia'),
+  'ms_MY' => 'Malay (Malaysia)',
-	'ga_IE' => array('Irish', 'Irish'),
+  'mi_NZ' => 'Maori (New Zealand)',
-	'it_IT' => array('Italian', 'italiano'),
+  'ne_NP' => 'Nepali (Nepal)',
-	'ja_JP' => array('Japanese', '日本語'),
+  'nb_NO' => 'Norwegian',
-	'jv_ID' => array('Javanese', 'basa Jawa'),
+  'fa_IR' => 'Persian (Iran)',
-	'ko_KR' => array('Korean', '한국어 [韓國語]'),
+  'pl_PL' => 'Polish (Poland)',
-	'ku_IQ' => array('Kurdish', 'Kurdí'),
+  'pt_BR' => 'Portuguese (Brazil)',
-	'lv_LV' => array('Latvian', 'latviešu'),
+  'pa_IN' => 'Punjabi (India)',
-	'lt_LT' => array('Lithuanian', 'lietuviškai'),
+  'ro_RO' => 'Romanian (Romania)',
-	'mk_MK' => array('Macedonian', 'македонски'),
+  'ru_RU' => 'Russian (Russia)',
-	'mi_NZ' => array('Maori', 'Maori'),
+  'sr_RS' => 'Serbian (Serbia)',
-	'ms_MY' => array('Malay', 'Bahasa melayu'),
+  'si_LK' => 'Sinhalese (Sri Lanka)',
-	'mt_MT' => array('Maltese', 'Malti'),
+  'sk_SK' => 'Slovak (Slovakia)',
-	'mr_IN' => array('Marathi', 'मराठी'),
+  'sl_SI' => 'Slovenian (Slovenia)',
-	'ne_NP' => array('Nepali', 'नेपाली'),
+  'es_AR' => 'Spanish (Argentina)',
-	'nb_NO' => array('Norwegian', 'Norsk'),
+  'es_MX' => 'Spanish (Mexico)',
-	'om_ET' => array('Oromo', 'Afaan Oromo'),
+  'es_ES' => 'Spanish (Spain)',
-	'fa_IR' => array('Persian', 'فارسى'),
+  'sv_SE' => 'Swedish (Sweden)',
-	'pl_PL' => array('Polish', 'polski'),
+  'th_TH' => 'Thai (Thailand)',
-	'pt_PT' => array('Portuguese (Portugal)', 'português (Portugal)'),
+  'tr_TR' => 'Turkish (Turkey)',
-	'pt_BR' => array('Portuguese (Brazil)', 'português (Brazil)'),
+  'uk_UA' => 'Ukrainian (Ukraine)',
-	'pa_IN' => array('Punjabi', 'ਪੰਜਾਬੀ'),
+  'uz_UZ' => 'Uzbek (Uzbekistan)',
-	'qu_PE' => array('Quechua', 'Quechua'),
+  'vi_VN' => 'Vietnamese (Vietnam)',
-	'rm_CH' => array('Romansh', 'rumantsch'),
-	'ro_RO' => array('Romanian', 'român'),
-	'ru_RU' => array('Russian', 'Русский'),
-	'sco_SCO' => array('Scots', 'Scoats leid, Lallans'),
-	'sr_RS' => array('Serbian', 'српски'),
-	'sk_SK' => array('Slovak', 'slovenčina'),
-	'sl_SI' => array('Slovenian', 'slovenščina'),
-	'es_ES' => array('Spanish', 'español'),
-	'sv_SE' => array('Swedish', 'Svenska'),
-	'tl_PH' => array('Tagalog', 'Tagalog'),
-	'ta_IN' => array('Tamil', 'தமிழ்'),
-	'te_IN' => array('Telugu', 'తెలుగు'),
-	'to_TO' => array('Tonga', 'chiTonga'),
-	'ts_ZA' => array('Tsonga', 'xiTshonga'),
-	'tn_ZA' => array('Tswana', 'seTswana'),
-	'tr_TR' => array('Turkish', 'Türkçe'),
-	'tk_TM' => array('Turkmen', 'түркmенче'),
-	'tw_GH' => array('Twi', 'twi'),
-	'uk_UA' => array('Ukrainian', 'Українська'),
-	'ur_PK' => array('Urdu', 'اردو'),
-	'uz_UZ' => array('Uzbek', 'ўзбек'),
-	've_ZA' => array('Venda', 'tshiVenḓa'),
-	'vi_VN' => array('Vietnamese', 'tiếng việt'),
-	'wo_SN' => array('Wolof', 'Wollof'),
-	'xh_ZA' => array('Xhosa', 'isiXhosa'),
-	'zu_ZA' => array('Zulu', 'isiZulu'),
 );
 
 // Discover which databases are available