| @@ -8,73 +8,116 @@ | ||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | $languages = array( |
| 11 | 11 | 'af' => __( 'Afrikaans', 'bogo' ), |
| 12 | + 'am' => __( 'Amharic', 'bogo' ), | |
| 13 | + 'an' => __( 'Aragonese', 'bogo' ), | |
| 12 | 14 | 'ar' => __( 'Arabic', 'bogo' ), |
| 15 | + 'as' => __( 'Assamese', 'bogo' ), | |
| 16 | + 'az' => __( 'Azerbaijani', 'bogo' ), | |
| 13 | 17 | 'be_BY' => __( 'Belarusian', 'bogo' ), |
| 14 | 18 | 'bg_BG' => __( 'Bulgarian', 'bogo' ), |
| 15 | 19 | 'bn_BD' => __( 'Bangla', 'bogo' ), |
| 20 | + 'bn_IN' => __( 'Indian Bengali', 'bogo' ), | |
| 21 | + 'bo' => __( 'Tibetan', 'bogo' ), | |
| 22 | + 'bs_BA' => __( 'Bosnian', 'bogo' ), | |
| 16 | 23 | 'ca' => __( 'Catalan', 'bogo' ), |
| 24 | + 'ckb' => __( 'Central Kurdish', 'bogo' ), | |
| 25 | + 'co' => __( 'Corsican', 'bogo' ), | |
| 17 | 26 | 'cs_CZ' => __( 'Czech', 'bogo' ), |
| 18 | 27 | 'cy' => __( 'Welsh', 'bogo' ), |
| 19 | 28 | 'da_DK' => __( 'Danish', 'bogo' ), |
| 20 | 29 | 'de_DE' => __( 'German', 'bogo' ), |
| 30 | + 'dv' => __( 'Dhivehi', 'bogo' ), | |
| 21 | 31 | 'el' => __( 'Greek', 'bogo' ), |
| 22 | - 'en_GB' => __( 'British English', 'bogo' ), | |
| 23 | - 'en_US' => __( 'English', 'bogo' ), | |
| 32 | + 'en_US' => __( 'English (United States)', 'bogo' ), | |
| 33 | + 'en_AU' => __( 'English (Australia)', 'bogo' ), | |
| 34 | + 'en_CA' => __( 'English (Canada)', 'bogo' ), | |
| 35 | + 'en_GB' => __( 'English (UK)', 'bogo' ), | |
| 24 | 36 | 'eo' => __( 'Esperanto', 'bogo' ), |
| 25 | - 'es_ES' => __( 'Spanish', 'bogo' ), | |
| 37 | + 'es_ES' => __( 'Spanish (Spain)', 'bogo' ), | |
| 38 | + 'es_CL' => __( 'Spanish (Chile)', 'bogo' ), | |
| 39 | + 'es_MX' => __( 'Mexican Spanish', 'bogo' ), | |
| 40 | + 'es_PE' => __( 'Spanish (Peru)', 'bogo' ), | |
| 41 | + 'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ), | |
| 26 | 42 | 'et' => __( 'Estonian', 'bogo' ), |
| 27 | 43 | 'eu' => __( 'Basque', 'bogo' ), |
| 28 | 44 | 'fa_IR' => __( 'Persian', 'bogo' ), |
| 29 | 45 | 'fi' => __( 'Finnish', 'bogo' ), |
| 30 | 46 | 'fo' => __( 'Faroese', 'bogo' ), |
| 31 | - 'fr_FR' => __( 'French', 'bogo' ), | |
| 32 | - 'ge_GE' => __( 'Georgian', 'bogo' ), | |
| 47 | + 'fr_FR' => __( 'French (France)', 'bogo' ), | |
| 48 | + 'fy' => __( 'Frisian', 'bogo' ), | |
| 49 | + 'ga' => __( 'Irish', 'bogo' ), | |
| 50 | + 'gd' => __( 'Scottish Gaelic', 'bogo' ), | |
| 33 | 51 | 'gl_ES' => __( 'Galician', 'bogo' ), |
| 34 | - 'ht' => __( 'Haitian', 'bogo' ), | |
| 52 | + 'gu' => __( 'Gujarati', 'bogo' ), | |
| 35 | 53 | 'he_IL' => __( 'Hebrew', 'bogo' ), |
| 54 | + 'hi_IN' => __( 'Hindi', 'bogo' ), | |
| 36 | 55 | 'hr' => __( 'Croatian', 'bogo' ), |
| 56 | + 'ht' => __( 'Haitian', 'bogo' ), | |
| 37 | 57 | 'hu_HU' => __( 'Hungarian', 'bogo' ), |
| 58 | + 'hy' => __( 'Armenian', 'bogo' ), | |
| 38 | 59 | 'id_ID' => __( 'Indonesian', 'bogo' ), |
| 39 | - 'ga_IE' => __( 'Irish', 'bogo' ), | |
| 40 | 60 | 'is_IS' => __( 'Icelandic', 'bogo' ), |
| 41 | 61 | 'it_IT' => __( 'Italian', 'bogo' ), |
| 42 | 62 | 'ja' => __( 'Japanese', 'bogo' ), |
| 63 | + 'jv_ID' => __( 'Javanese', 'bogo' ), | |
| 64 | + 'ka_GE' => __( 'Georgian', 'bogo' ), | |
| 65 | + 'kk' => __( 'Kazakh', 'bogo' ), | |
| 43 | 66 | 'km_KH' => __( 'Khmer', 'bogo' ), |
| 67 | + 'kn' => __( 'Kannada', 'bogo' ), | |
| 44 | 68 | 'ko_KR' => __( 'Korean', 'bogo' ), |
| 69 | + 'li' => __( 'Limburgish', 'bogo' ), | |
| 70 | + 'lo' => __( 'Lao', 'bogo' ), | |
| 45 | 71 | 'lt_LT' => __( 'Lithuanian', 'bogo' ), |
| 46 | 72 | 'lv' => __( 'Latvian', 'bogo' ), |
| 47 | 73 | 'mg_MG' => __( 'Malagasy', 'bogo' ), |
| 48 | 74 | 'mk_MK' => __( 'Macedonian', 'bogo' ), |
| 49 | - 'mn_MN' => __( 'Mongolian', 'bogo' ), | |
| 75 | + 'ml_IN' => __( 'Malayalam', 'bogo' ), | |
| 76 | + 'mn' => __( 'Mongolian', 'bogo' ), | |
| 77 | + 'mr' => __( 'Marathi', 'bogo' ), | |
| 50 | 78 | 'ms_MY' => __( 'Malay', 'bogo' ), |
| 51 | - 'nb_NO' => __( 'Norwegian', 'bogo' ), | |
| 79 | + 'mt_MT' => __( 'Maltese', 'bogo' ), | |
| 80 | + 'my_MM' => __( 'Burmese', 'bogo' ), | |
| 81 | + 'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ), | |
| 82 | + 'ne_NP' => __( 'Nepali', 'bogo' ), | |
| 52 | 83 | 'ni_ID' => __( 'Nias', 'bogo' ), |
| 53 | 84 | 'nl_NL' => __( 'Dutch', 'bogo' ), |
| 85 | + 'os' => __( 'Ossetic', 'bogo' ), | |
| 86 | + 'pa_IN' => __( 'Punjabi', 'bogo' ), | |
| 54 | 87 | 'pl_PL' => __( 'Polish', 'bogo' ), |
| 55 | - 'pt_BR' => __( 'Brazilian Portuguese', 'bogo' ), | |
| 56 | - 'pt_PT' => __( 'Portuguese', 'bogo' ), | |
| 88 | + 'pt_BR' => __( 'Portuguese (Brazil)', 'bogo' ), | |
| 89 | + 'pt_PT' => __( 'Portuguese (Portugal)', 'bogo' ), | |
| 57 | 90 | 'ro_RO' => __( 'Romanian', 'bogo' ), |
| 58 | 91 | 'ru_RU' => __( 'Russian', 'bogo' ), |
| 92 | + 'sa_IN' => __( 'Sanskrit', 'bogo' ), | |
| 59 | 93 | 'si_LK' => __( 'Sinhala', 'bogo' ), |
| 60 | 94 | 'sk_SK' => __( 'Slovak', 'bogo' ), |
| 61 | 95 | 'sl_SI' => __( 'Slovenian', 'bogo' ), |
| 96 | + 'so_SO' => __( 'Somali', 'bogo' ), | |
| 62 | 97 | 'sq' => __( 'Albanian', 'bogo' ), |
| 63 | 98 | 'sr_RS' => __( 'Serbian', 'bogo' ), |
| 64 | 99 | 'sv_SE' => __( 'Swedish', 'bogo' ), |
| 65 | 100 | 'su_ID' => __( 'Sundanese', 'bogo' ), |
| 101 | + 'sw' => __( 'Swahili', 'bogo' ), | |
| 102 | + 'ta_IN' => __( 'Tamil', 'bogo' ), | |
| 103 | + 'te' => __( 'Telugu', 'bogo' ), | |
| 66 | 104 | 'tg' => __( 'Tajik', 'bogo' ), |
| 67 | 105 | 'th' => __( 'Thai', 'bogo' ), |
| 68 | 106 | 'tl' => __( 'Tagalog', 'bogo' ), |
| 69 | - 'tr' => __( 'Turkish', 'bogo' ), | |
| 107 | + 'tr_TR' => __( 'Turkish', 'bogo' ), | |
| 108 | + 'tt_RU' => __( 'Tatar', 'bogo' ), | |
| 109 | + 'ug_CN' => __( 'Uighur', 'bogo' ), | |
| 70 | 110 | 'uk' => __( 'Ukrainian', 'bogo' ), |
| 111 | + 'ur' => __( 'Urdu', 'bogo' ), | |
| 71 | 112 | 'uz_UZ' => __( 'Uzbek', 'bogo' ), |
| 72 | 113 | 'vi' => __( 'Vietnamese', 'bogo' ), |
| 73 | - 'zh_CN' => __( 'Chinese', 'bogo' ), | |
| 74 | - 'zh_TW' => __( 'Traditional Chinese', 'bogo' ) | |
| 114 | + 'zh_CN' => __( 'Chinese (China)', 'bogo' ), | |
| 115 | + 'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' ) | |
| 75 | 116 | ); |
| 76 | 117 | |
| 118 | + asort( $languages, SORT_STRING ); | |
| 119 | + | |
| 77 | 120 | $languages = apply_filters( 'bogo_languages', $languages ); |
| 78 | 121 | |
| 79 | 122 | return $languages; |
| 80 | 123 | } |
| @@ -88,21 +131,32 @@ | ||
| 88 | 131 | return null; |
| 89 | 132 | } |
| 90 | 133 | |
| 91 | 134 | function bogo_get_default_locale() { |
| 92 | - if ( defined( 'WPLANG' ) ) | |
| 135 | + if ( defined( 'WPLANG' ) ) { | |
| 93 | 136 | $locale = WPLANG; |
| 137 | + } | |
| 94 | 138 | |
| 95 | 139 | if ( is_multisite() ) { |
| 96 | - if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) | |
| 140 | + if ( defined( 'WP_INSTALLING' ) | |
| 141 | + || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) { | |
| 97 | 142 | $ms_locale = get_site_option( 'WPLANG' ); |
| 143 | + } | |
| 98 | 144 | |
| 99 | - if ( $ms_locale !== false ) | |
| 145 | + if ( $ms_locale !== false ) { | |
| 100 | 146 | $locale = $ms_locale; |
| 147 | + } | |
| 148 | + } else { | |
| 149 | + $db_locale = get_option( 'WPLANG' ); | |
| 150 | + | |
| 151 | + if ( $db_locale !== false ) { | |
| 152 | + $locale = $db_locale; | |
| 153 | + } | |
| 101 | 154 | } |
| 102 | 155 | |
| 103 | - if ( empty( $locale ) ) | |
| 156 | + if ( empty( $locale ) ) { | |
| 104 | 157 | $locale = 'en_US'; |
| 158 | + } | |
| 105 | 159 | |
| 106 | 160 | return $locale; |
| 107 | 161 | } |
| 108 | 162 | |
| @@ -111,18 +165,15 @@ | ||
| 111 | 165 | |
| 112 | 166 | return ! empty( $locale ) && $locale == bogo_get_default_locale(); |
| 113 | 167 | } |
| 114 | 168 | |
| 115 | -function bogo_available_languages( $args = '' ) { | |
| 169 | +function bogo_available_locales( $args = '' ) { | |
| 116 | 170 | $defaults = array( |
| 117 | 171 | 'exclude' => array(), |
| 118 | - 'orderby' => 'key', | |
| 119 | - 'order' => 'ASC' ); | |
| 172 | + 'current_user_can_access' => false ); | |
| 120 | 173 | |
| 121 | 174 | $args = wp_parse_args( $args, $defaults ); |
| 122 | 175 | |
| 123 | - $langs = array(); | |
| 124 | - | |
| 125 | 176 | $installed_locales = get_available_languages(); |
| 126 | 177 | $installed_locales[] = bogo_get_default_locale(); |
| 127 | 178 | $installed_locales[] = 'en_US'; |
| 128 | 179 | $installed_locales = array_unique( $installed_locales ); |
| @@ -127,30 +178,56 @@ | ||
| 127 | 178 | $installed_locales[] = 'en_US'; |
| 128 | 179 | $installed_locales = array_unique( $installed_locales ); |
| 129 | 180 | $installed_locales = array_filter( $installed_locales ); |
| 130 | 181 | |
| 182 | + $available_locales = array(); | |
| 183 | + | |
| 131 | 184 | foreach ( $installed_locales as $locale ) { |
| 132 | - if ( in_array( $locale, (array) $args['exclude'] ) ) | |
| 185 | + if ( in_array( $locale, (array) $args['exclude'] ) ) { | |
| 133 | 186 | continue; |
| 187 | + } | |
| 134 | 188 | |
| 135 | - $lang = bogo_get_language( $locale ); | |
| 189 | + if ( $args['current_user_can_access'] | |
| 190 | + && ! current_user_can( 'bogo_access_locale', $locale ) ) { | |
| 191 | + continue; | |
| 192 | + } | |
| 136 | 193 | |
| 137 | - if ( empty( $lang ) ) | |
| 138 | - $lang = "[$locale]"; | |
| 194 | + $available_locales[] = $locale; | |
| 195 | + } | |
| 139 | 196 | |
| 140 | - $langs[$locale] = $lang; | |
| 197 | + return $available_locales; | |
| 198 | +} | |
| 199 | + | |
| 200 | +function bogo_available_languages( $args = '' ) { | |
| 201 | + $defaults = array( | |
| 202 | + 'exclude' => array(), | |
| 203 | + 'orderby' => 'key', | |
| 204 | + 'order' => 'ASC', | |
| 205 | + 'current_user_can_access' => false ); | |
| 206 | + | |
| 207 | + $args = wp_parse_args( $args, $defaults ); | |
| 208 | + | |
| 209 | + $langs = array(); | |
| 210 | + | |
| 211 | + $available_locales = bogo_available_locales( $args ); | |
| 212 | + | |
| 213 | + foreach ( $available_locales as $locale ) { | |
| 214 | + $lang = bogo_get_language( $locale ); | |
| 215 | + $langs[$locale] = empty( $lang ) ? "[$locale]" : $lang; | |
| 141 | 216 | } |
| 142 | 217 | |
| 143 | 218 | if ( 'value' == $args['orderby'] ) { |
| 144 | 219 | natcasesort( $langs ); |
| 145 | 220 | |
| 146 | - if ( 'DESC' == $args['order'] ) | |
| 221 | + if ( 'DESC' == $args['order'] ) { | |
| 147 | 222 | $langs = array_reverse( $langs ); |
| 223 | + } | |
| 148 | 224 | } else { |
| 149 | - if ( 'DESC' == $args['order'] ) | |
| 225 | + if ( 'DESC' == $args['order'] ) { | |
| 150 | 226 | krsort( $langs ); |
| 151 | - else | |
| 227 | + } else { | |
| 152 | 228 | ksort( $langs ); |
| 229 | + } | |
| 153 | 230 | } |
| 154 | 231 | |
| 155 | 232 | $langs = apply_filters( 'bogo_available_languages', $langs, $args ); |
| 156 | 233 | |
| @@ -157,11 +234,25 @@ | ||
| 157 | 234 | return $langs; |
| 158 | 235 | } |
| 159 | 236 | |
| 160 | 237 | function bogo_is_available_locale( $locale ) { |
| 161 | - return ! empty( $locale ) && array_key_exists( $locale, (array) bogo_available_languages() ); | |
| 238 | + if ( empty( $locale ) ) { | |
| 239 | + return false; | |
| 240 | + } | |
| 241 | + | |
| 242 | + static $available_locales = array(); | |
| 243 | + | |
| 244 | + if ( empty( $available_locales ) ) { | |
| 245 | + $available_locales = bogo_available_locales(); | |
| 246 | + } | |
| 247 | + | |
| 248 | + return in_array( $locale, $available_locales ); | |
| 162 | 249 | } |
| 163 | 250 | |
| 251 | +function bogo_filter_locales( $locales, $filter = 'available' ) { | |
| 252 | + return array_intersect( $locales, bogo_available_locales() ); | |
| 253 | +} | |
| 254 | + | |
| 164 | 255 | function bogo_language_tag( $locale ) { |
| 165 | 256 | // http://www.ietf.org/rfc/bcp/bcp47.txt |
| 166 | 257 | $tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale ); |
| 167 | 258 | $tag = trim( $tag, '-' ); |
| @@ -175,9 +266,9 @@ | ||
| 175 | 266 | |
| 176 | 267 | if ( false !== $pos = strpos( $tag, '-' ) ) |
| 177 | 268 | $slug = substr( $tag, 0, $pos ); |
| 178 | 269 | |
| 179 | - $variations = preg_grep( '/^' . $slug . '/', array_keys( bogo_available_languages() ) ); | |
| 270 | + $variations = preg_grep( '/^' . $slug . '/', bogo_available_locales() ); | |
| 180 | 271 | |
| 181 | 272 | if ( 1 < count( $variations ) ) |
| 182 | 273 | $slug = $tag; |
| 183 | 274 | |
| @@ -184,10 +275,9 @@ | ||
| 184 | 275 | return apply_filters( 'bogo_lang_slug', $slug, $locale ); |
| 185 | 276 | } |
| 186 | 277 | |
| 187 | 278 | function bogo_get_lang_regex() { |
| 188 | - $langs = array_keys( bogo_available_languages() ); | |
| 189 | - $langs = array_map( 'bogo_lang_slug', $langs ); | |
| 279 | + $langs = array_map( 'bogo_lang_slug', bogo_available_locales() ); | |
| 190 | 280 | $langs = array_filter( $langs ); |
| 191 | 281 | |
| 192 | 282 | if ( empty( $langs ) ) |
| 193 | 283 | return ''; |
| @@ -203,9 +293,9 @@ | ||
| 203 | 293 | |
| 204 | 294 | $language_code = $matches[1]; |
| 205 | 295 | $region_code = isset( $matches[2] ) ? $matches[2] : ''; |
| 206 | 296 | |
| 207 | - $locales = array_keys( bogo_available_languages() ); | |
| 297 | + $locales = bogo_available_locales(); | |
| 208 | 298 | |
| 209 | 299 | if ( $region_code ) { |
| 210 | 300 | $locale = $language_code . '_' . strtoupper( $region_code ); |
| 211 | 301 | |
| @@ -305,10 +395,9 @@ | ||
| 305 | 395 | |
| 306 | 396 | return $url; |
| 307 | 397 | } |
| 308 | 398 | |
| 309 | - $available_languages = array_keys( bogo_available_languages() ); | |
| 310 | - $available_languages = array_map( 'bogo_lang_slug', $available_languages ); | |
| 399 | + $available_languages = array_map( 'bogo_lang_slug', bogo_available_locales() ); | |
| 311 | 400 | |
| 312 | 401 | $url = preg_replace( |
| 313 | 402 | '#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#', |
| 314 | 403 | $home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ), |
| @@ -329,10 +418,9 @@ | ||
| 329 | 418 | |
| 330 | 419 | $home = set_url_scheme( get_option( 'home' ) ); |
| 331 | 420 | $home = trailingslashit( $home ); |
| 332 | 421 | |
| 333 | - $available_languages = array_keys( bogo_available_languages() ); | |
| 334 | - $available_languages = array_map( 'bogo_lang_slug', $available_languages ); | |
| 422 | + $available_languages = array_map( 'bogo_lang_slug', bogo_available_locales() ); | |
| 335 | 423 | |
| 336 | 424 | $regex = '#^' . preg_quote( $home ) . '(' . implode( '|', $available_languages ) . ')/#'; |
| 337 | 425 | |
| 338 | 426 | if ( preg_match( $regex, trailingslashit( $url ), $matches ) ) |
