Improved language support, props momo360modena, fixes #464

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1121 7be80a69-a1ef-0310-a953-fb0f7c49ff36

3 files changed, 29 insertions, 24 deletions

diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php
index 297f10e..2ba8327 100644
--- a/wp-admin/includes/mu.php
+++ b/wp-admin/includes/mu.php
@@ -334,4 +334,11 @@ function wpmu_checkAvailableSpace() {
 }
 add_action('upload_files_upload','wpmu_checkAvailableSpace');
 
+function format_code_lang( $code = '' ) {
+	$code = strtolower(substr($code, 0, 2));
+	$lang_codes = array('aa' => 'Afar',  'ab' => 'Abkhazian',  'af' => 'Afrikaans',  'ak' => 'Akan',  'sq' => 'Albanian',  'am' => 'Amharic',  'ar' => 'Arabic',  'an' => 'Aragonese',  'hy' => 'Armenian',  'as' => 'Assamese',  'av' => 'Avaric',  'ae' => 'Avestan',  'ay' => 'Aymara',  'az' => 'Azerbaijani',  'ba' => 'Bashkir',  'bm' => 'Bambara',  'eu' => 'Basque',  'be' => 'Belarusian',  'bn' => 'Bengali',  'bh' => 'Bihari',  'bi' => 'Bislama',  'bs' => 'Bosnian',  'br' => 'Breton',  'bg' => 'Bulgarian',  'my' => 'Burmese',  'ca' => 'Catalan; Valencian',  'ch' => 'Chamorro',  'ce' => 'Chechen',  'zh' => 'Chinese',  'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic',  'cv' => 'Chuvash',  'kw' => 'Cornish',  'co' => 'Corsican',  'cr' => 'Cree',  'cs' => 'Czech',  'da' => 'Danish',  'dv' => 'Divehi; Dhivehi; Maldivian',  'nl' => 'Dutch; Flemish',  'dz' => 'Dzongkha',  'en' => 'English',  'eo' => 'Esperanto',  'et' => 'Estonian',  'ee' => 'Ewe',  'fo' => 'Faroese',  'fj' => 'Fijian',  'fi' => 'Finnish',  'fr' => 'French',  'fy' => 'Western Frisian',  'ff' => 'Fulah',  'ka' => 'Georgian',  'de' => 'German',  'gd' => 'Gaelic; Scottish Gaelic',  'ga' => 'Irish',  'gl' => 'Galician',  'gv' => 'Manx',  'el' => 'Greek, Modern',  'gn' => 'Guarani',  'gu' => 'Gujarati',  'ht' => 'Haitian; Haitian Creole',  'ha' => 'Hausa',  'he' => 'Hebrew',  'hz' => 'Herero',  'hi' => 'Hindi',  'ho' => 'Hiri Motu',  'hu' => 'Hungarian',  'ig' => 'Igbo',  'is' => 'Icelandic',  'io' => 'Ido',  'ii' => 'Sichuan Yi',  'iu' => 'Inuktitut',  'ie' => 'Interlingue',  'ia' => 'Interlingua (International Auxiliary Language Association)',  'id' => 'Indonesian',  'ik' => 'Inupiaq',  'it' => 'Italian',  'jv' => 'Javanese',  'ja' => 'Japanese',  'kl' => 'Kalaallisut; Greenlandic',  'kn' => 'Kannada',  'ks' => 'Kashmiri',  'kr' => 'Kanuri',  'kk' => 'Kazakh',  'km' => 'Central Khmer',  'ki' => 'Kikuyu; Gikuyu',  'rw' => 'Kinyarwanda',  'ky' => 'Kirghiz; Kyrgyz',  'kv' => 'Komi',  'kg' => 'Kongo',  'ko' => 'Korean',  'kj' => 'Kuanyama; Kwanyama',  'ku' => 'Kurdish',  'lo' => 'Lao',  'la' => 'Latin',  'lv' => 'Latvian',  'li' => 'Limburgan; Limburger; Limburgish',  'ln' => 'Lingala',  'lt' => 'Lithuanian',  'lb' => 'Luxembourgish; Letzeburgesch',  'lu' => 'Luba-Katanga',  'lg' => 'Ganda',  'mk' => 'Macedonian',  'mh' => 'Marshallese',  'ml' => 'Malayalam',  'mi' => 'Maori',  'mr' => 'Marathi',  'ms' => 'Malay',  'mg' => 'Malagasy',  'mt' => 'Maltese',  'mo' => 'Moldavian',  'mn' => 'Mongolian',  'na' => 'Nauru',  'nv' => 'Navajo; Navaho',  'nr' => 'Ndebele, South; South Ndebele',  'nd' => 'Ndebele, North; North Ndebele',  'ng' => 'Ndonga',  'ne' => 'Nepali',  'nn' => 'Norwegian Nynorsk; Nynorsk, Norwegian',  'nb' => 'Bokmål, Norwegian, Norwegian Bokmål',  'no' => 'Norwegian',  'ny' => 'Chichewa; Chewa; Nyanja',  'oc' => 'Occitan, Provençal',  'oj' => 'Ojibwa',  'or' => 'Oriya',  'om' => 'Oromo',  'os' => 'Ossetian; Ossetic',  'pa' => 'Panjabi; Punjabi',  'fa' => 'Persian',  'pi' => 'Pali',  'pl' => 'Polish',  'pt' => 'Portuguese',  'ps' => 'Pushto',  'qu' => 'Quechua',  'rm' => 'Romansh',  'ro' => 'Romanian',  'rn' => 'Rundi',  'ru' => 'Russian',  'sg' => 'Sango',  'sa' => 'Sanskrit',  'sr' => 'Serbian',  'hr' => 'Croatian',  'si' => 'Sinhala; Sinhalese',  'sk' => 'Slovak',  'sl' => 'Slovenian',  'se' => 'Northern Sami',  'sm' => 'Samoan',  'sn' => 'Shona',  'sd' => 'Sindhi',  'so' => 'Somali',  'st' => 'Sotho, Southern',  'es' => 'Spanish; Castilian',  'sc' => 'Sardinian',  'ss' => 'Swati',  'su' => 'Sundanese',  'sw' => 'Swahili',  'sv' => 'Swedish',  'ty' => 'Tahitian',  'ta' => 'Tamil',  'tt' => 'Tatar',  'te' => 'Telugu',  'tg' => 'Tajik',  'tl' => 'Tagalog',  'th' => 'Thai',  'bo' => 'Tibetan',  'ti' => 'Tigrinya',  'to' => 'Tonga (Tonga Islands)',  'tn' => 'Tswana',  'ts' => 'Tsonga',  'tk' => 'Turkmen',  'tr' => 'Turkish',  'tw' => 'Twi',  'ug' => 'Uighur; Uyghur',  'uk' => 'Ukrainian',  'ur' => 'Urdu',  'uz' => 'Uzbek',  've' => 'Venda',  'vi' => 'Vietnamese',  'vo' => 'Volapük',  'cy' => 'Welsh',  'wa' => 'Walloon',  'wo' => 'Wolof',  'xh' => 'Xhosa',  'yi' => 'Yiddish',  'yo' => 'Yoruba',  'za' => 'Zhuang; Chuang',  'zu' => 'Zulu');
+	$lang_codes = apply_filters('lang_codes', $lang_codes);
+	return strtr( $code, $lang_codes );
+}
+
 ?>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index c768611..e201be0 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -40,26 +40,26 @@ include('./admin-header.php');
 </tr>
 
 <?php
-$lang_files = glob( ABSPATH . LANGDIR . "/*" );
-$lang = get_option( "WPLANG" );
+$lang_files = glob( ABSPATH . LANGDIR . '/*.mo' );
+$lang = get_option('WPLANG');
 
-if( is_array( $lang_files ) && count($lang_files) >= 1 ) {
+if( is_array( $lang_files ) ) {
 	?>
 	<tr valign="top"> 
-	<th width="33%" scope="row"><?php _e('Language:') ?></th> 
-	<td><select name="WPLANG" id="WPLANG">
+		<th width="33%" scope="row"><?php _e('Blog language:') ?></th> 
+		<td>
+			<select name="WPLANG" id="WPLANG">
+				<?php
+				echo '<option value=""'.((empty($lang)) ? 'selected="selected"': '').'>'.__('English').'</option>';
+				foreach ( (array) $lang_files as $key => $val ) {
+					$code_lang = basename( $val, '.mo' );
+					echo '<option value="'.$code_lang.'"'.(($lang == $code_lang) ? ' selected="selected"' : '').'> '.format_code_lang($code_lang).'</option>';
+				}
+				?>
+			</select>
+		</td>
+	</tr> 
 	<?php
-	echo "<option value=''>Default</option>";
-	while( list( $key, $val ) = each( $lang_files ) ) { 
-		$l = basename( $val, ".mo" );
-		echo "<option value='$l'";
-		echo $lang == $l ? " selected" : "";
-		echo "> $l</option>";
-	}
-	?>
-		</select></td>
-		</tr> 
-		<?php
 } // languages
 ?>
 </table> 
diff --git a/wp-admin/wpmu-options.php b/wp-admin/wpmu-options.php
index 746fec5..ab63754 100644
--- a/wp-admin/wpmu-options.php
+++ b/wp-admin/wpmu-options.php
@@ -163,8 +163,8 @@ if (isset($_GET['updated'])) {
 			<legend><?php _e('Site Wide Settings <em>(These settings may be overridden by blog owners)</em>') ?></legend> 
 			<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
 				<?php
-				$lang_files = glob( ABSPATH . LANGDIR . "/*.mo" );
-				$lang = get_site_option( "WPLANG" );
+				$lang_files = glob( ABSPATH . LANGDIR . '/*.mo' );
+				$lang = get_site_option('WPLANG');
 				if( is_array( $lang_files ) ) {
 					?>
 					<tr valign="top"> 
@@ -172,12 +172,10 @@ if (isset($_GET['updated'])) {
 						<td>
 							<select name="WPLANG" id="WPLANG">
 							<?php
-							echo "<option value=''>".__('Default')."</option>";
+							echo '<option value=""'.((empty($lang)) ? ' selected="selected"' : '').'>'.__('English')."</option>";
 							foreach ( (array) $lang_files as $key => $val ) {
-								$l = basename( $val, ".mo" );
-								echo "<option value='$l'";
-								echo $lang == $l ? " selected='selected'" : "";
-								echo "> $l</option>";
+								$code_lang = basename( $val, '.mo' );
+								echo '<option value="'.$code_lang.'"'.(($lang == $code_lang) ? ' selected="selected"' : '').'> '.format_code_lang($code_lang).'</option>';
 							}
 							?>
 							</select>
@@ -198,7 +196,7 @@ if (isset($_GET['updated'])) {
 				</tr>
 				<?php
 				$menu_perms = get_site_option( "menu_items" );
-				$menu_items = array( "plugins" );
+				$menu_items = array('plugins');
 				foreach ( (array) $menu_items as $key => $val ) {
 					$checked = ( $menu_perms[$val] == '1' ) ? ' checked="checked"' : '';
 					echo "<tr><th scope='row'>" . ucfirst( $val ) . "</th><td><input type='checkbox' name='menu_items[" . $val . "]' value='1'" . $checked . " /></td></tr>";