diff options
-rw-r--r-- | wp-admin/includes/mu.php | 45 | ||||
-rw-r--r-- | wp-admin/options-general.php | 15 | ||||
-rw-r--r-- | wp-admin/wpmu-options.php | 15 |
3 files changed, 51 insertions, 24 deletions
diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php index 76af194..1db471d 100644 --- a/wp-admin/includes/mu.php +++ b/wp-admin/includes/mu.php @@ -343,7 +343,7 @@ 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); + $lang_codes = apply_filters('lang_codes', $lang_codes, $code); return strtr( $code, $lang_codes ); } @@ -432,14 +432,14 @@ add_filter( 'import_allow_create_users', 'import_no_new_users' ); // See "import_allow_fetch_attachments" and "import_attachment_size_limit" filters too. function add_option_update_handler($option_group, $option_name, $sanitize_callback = '') { - global $new_whitelist_options, $sanitize_callbacks; + global $new_whitelist_options; $new_whitelist_options[ $option_group ][] = $option_name; if( $sanitize_callback != '' ) add_filter( "sanitize_option_{$option_name}", $sanitize_callback ); } function remove_option_update_handler($option_group, $option_name, $sanitize_callback = '') { - global $new_whitelist_options, $sanitize_callbacks; + global $new_whitelist_options; $pos = array_search( $option_name, $new_whitelist_options ); if( $pos !== false ) unset( $new_whitelist_options[ $option_group ][ $pos ] ); @@ -491,7 +491,7 @@ function remove_option_whitelist( $del_options, $options = '' ) { /* Blogswitcher */ function blogswitch_init() { - global $current_user, $current_blog; + global $current_user; $blogs = get_blogs_of_user( $current_user->ID ); if ( !$blogs ) return; @@ -515,10 +515,10 @@ function blogswitch_markup() { $list = array(); $options = array(); - $primary_blog = get_usermeta( $current_user->ID, 'primary_blog' ); + $blogs = get_blogs_of_user( $current_user->ID ); - foreach ( $blogs = get_blogs_of_user( $current_user->ID ) as $blog ) { + foreach ( (array) $blogs as $blog ) { if ( !$blog->blogname ) continue; @@ -591,4 +591,37 @@ function mu_css() { wp_admin_css( 'css/mu' ); } add_action( 'admin_head', 'mu_css' ); + +function mu_dropdown_languages( $lang_files = array(), $current = '' ) { + $flag = false; + $output = array(); + + foreach ( (array) $lang_files as $val ) { + $code_lang = basename( $val, '.mo' ); + + if ( $code_lang == 'en_US' ) { // American English + $flag = true; + $ae = __('American English'); + $output[$ae] = '<option value="'.$code_lang.'"'.(($current == $code_lang) ? ' selected="selected"' : '').'> '.$ae.'</option>'; + } elseif ( $code_lang == 'en_GB' ) { // British English + $flag = true; + $be = __('British English'); + $output[$be] = '<option value="'.$code_lang.'"'.(($current == $code_lang) ? ' selected="selected"' : '').'> '.$be.'</option>'; + } else { + $translated = format_code_lang($code_lang); + $output[$translated] = '<option value="'.$code_lang.'"'.(($current == $code_lang) ? ' selected="selected"' : '').'> '.$translated.'</option>'; + } + + } + + if ( $flag === false ) { // WordPress english + $output[] = '<option value=""'.((empty($current)) ? ' selected="selected"' : '').'>'.__('English')."</option>"; + } + + // Order by name + uksort($output, 'strnatcasecmp'); + + $output = apply_filters('mu_dropdown_languages', $output, $lang_files, $current); + echo implode("\n\t", $output); +} ?> diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index e2be9c0..8fdf3ef 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -92,22 +92,19 @@ endfor; </select></td> </tr> <?php -$lang_files = glob( ABSPATH . LANGDIR . '/*.mo' ); +if( is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) ) + while( ( $lang_file = readdir( $dh ) ) !== false ) + if( substr( $lang_file, -3 ) == '.mo' ) + $lang_files[] = $lang_file; $lang = get_option('WPLANG'); -if( is_array( $lang_files ) ) { +if( is_array($lang_files) && !empty($lang_files) ) { ?> <tr valign="top"> <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>'; - } - ?> + <?php mu_dropdown_languages( $lang_files, get_option('WPLANG') ); ?> </select> </td> </tr> diff --git a/wp-admin/wpmu-options.php b/wp-admin/wpmu-options.php index ce539a5..dc72e7e 100644 --- a/wp-admin/wpmu-options.php +++ b/wp-admin/wpmu-options.php @@ -145,21 +145,18 @@ if (isset($_GET['updated'])) { <h3><?php _e('Site Wide Settings <em>(These settings may be overridden by blog owners)</em>') ?></h3> <table class="form-table"> <?php - $lang_files = glob( ABSPATH . LANGDIR . '/*.mo' ); + if( is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) ) + while( ( $lang_file = readdir( $dh ) ) !== false ) + if( substr( $lang_file, -3 ) == '.mo' ) + $lang_files[] = $lang_file; $lang = get_site_option('WPLANG'); - if( is_array( $lang_files ) ) { + if( is_array($lang_files) && !empty($lang_files) ) { ?> <tr valign="top"> <th width="33%"><?php _e('Default 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>'; - } - ?> + <?php mu_dropdown_languages( $lang_files, get_site_option('WPLANG') ); ?> </select> </td> </tr> |