| @@ -1,12 +1,11 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | function bogo_languages() { |
| 4 | 4 | static $languages = array(); |
| 5 | - static $textdomain_loaded = false; | |
| 6 | 5 | |
| 7 | - if ( $languages && $textdomain_loaded ) { | |
| 8 | - return apply_filters( 'bogo_languages', $languages ); | |
| 6 | + if ( ! empty( $languages ) ) { | |
| 7 | + return $languages; | |
| 9 | 8 | } |
| 10 | 9 | |
| 11 | 10 | $languages = array( |
| 12 | 11 | 'af' => __( 'Afrikaans', 'bogo' ), |
| @@ -12,12 +11,10 @@ | ||
| 12 | 11 | 'af' => __( 'Afrikaans', 'bogo' ), |
| 13 | 12 | 'am' => __( 'Amharic', 'bogo' ), |
| 14 | 13 | 'an' => __( 'Aragonese', 'bogo' ), |
| 15 | 14 | 'ar' => __( 'Arabic', 'bogo' ), |
| 16 | - 'ary' => __( 'Moroccan Arabic', 'bogo' ), | |
| 17 | 15 | 'as' => __( 'Assamese', 'bogo' ), |
| 18 | 16 | 'az' => __( 'Azerbaijani', 'bogo' ), |
| 19 | - 'azb' => __( 'South Azerbaijani', 'bogo' ), | |
| 20 | 17 | 'be_BY' => __( 'Belarusian', 'bogo' ), |
| 21 | 18 | 'bg_BG' => __( 'Bulgarian', 'bogo' ), |
| 22 | 19 | 'bn_BD' => __( 'Bangla', 'bogo' ), |
| 23 | 20 | 'bn_IN' => __( 'Indian Bengali', 'bogo' ), |
| @@ -23,9 +20,8 @@ | ||
| 23 | 20 | 'bn_IN' => __( 'Indian Bengali', 'bogo' ), |
| 24 | 21 | 'bo' => __( 'Tibetan', 'bogo' ), |
| 25 | 22 | 'bs_BA' => __( 'Bosnian', 'bogo' ), |
| 26 | 23 | 'ca' => __( 'Catalan', 'bogo' ), |
| 27 | - 'ceb' => __( 'Cebuano', 'bogo' ), | |
| 28 | 24 | 'ckb' => __( 'Central Kurdish', 'bogo' ), |
| 29 | 25 | 'co' => __( 'Corsican', 'bogo' ), |
| 30 | 26 | 'cs_CZ' => __( 'Czech', 'bogo' ), |
| 31 | 27 | 'cy' => __( 'Welsh', 'bogo' ), |
| @@ -30,10 +26,8 @@ | ||
| 30 | 26 | 'cs_CZ' => __( 'Czech', 'bogo' ), |
| 31 | 27 | 'cy' => __( 'Welsh', 'bogo' ), |
| 32 | 28 | 'da_DK' => __( 'Danish', 'bogo' ), |
| 33 | 29 | 'de_DE' => __( 'German', 'bogo' ), |
| 34 | - 'de_DE_formal' => __( 'German (Formal)', 'bogo' ), | |
| 35 | - 'de_CH' => __( 'German (Switzerland)', 'bogo' ), | |
| 36 | 30 | 'dv' => __( 'Dhivehi', 'bogo' ), |
| 37 | 31 | 'el' => __( 'Greek', 'bogo' ), |
| 38 | 32 | 'en_US' => __( 'English (United States)', 'bogo' ), |
| 39 | 33 | 'en_AU' => __( 'English (Australia)', 'bogo' ), |
| @@ -38,17 +32,12 @@ | ||
| 38 | 32 | 'en_US' => __( 'English (United States)', 'bogo' ), |
| 39 | 33 | 'en_AU' => __( 'English (Australia)', 'bogo' ), |
| 40 | 34 | 'en_CA' => __( 'English (Canada)', 'bogo' ), |
| 41 | 35 | 'en_GB' => __( 'English (UK)', 'bogo' ), |
| 42 | - 'en_NZ' => __( 'English (New Zealand)', 'bogo' ), | |
| 43 | - 'en_ZA' => __( 'English (South Africa)', 'bogo' ), | |
| 44 | 36 | 'eo' => __( 'Esperanto', 'bogo' ), |
| 45 | 37 | 'es_ES' => __( 'Spanish (Spain)', 'bogo' ), |
| 46 | - 'es_AR' => __( 'Spanish (Argentina)', 'bogo' ), | |
| 47 | 38 | 'es_CL' => __( 'Spanish (Chile)', 'bogo' ), |
| 48 | - 'es_CO' => __( 'Spanish (Colombia)', 'bogo' ), | |
| 49 | - 'es_GT' => __( 'Spanish (Guatemala)', 'bogo' ), | |
| 50 | - 'es_MX' => __( 'Spanish (Mexico)', 'bogo' ), | |
| 39 | + 'es_MX' => __( 'Mexican Spanish', 'bogo' ), | |
| 51 | 40 | 'es_PE' => __( 'Spanish (Peru)', 'bogo' ), |
| 52 | 41 | 'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ), |
| 53 | 42 | 'et' => __( 'Estonian', 'bogo' ), |
| 54 | 43 | 'eu' => __( 'Basque', 'bogo' ), |
| @@ -55,16 +44,13 @@ | ||
| 55 | 44 | 'fa_IR' => __( 'Persian', 'bogo' ), |
| 56 | 45 | 'fi' => __( 'Finnish', 'bogo' ), |
| 57 | 46 | 'fo' => __( 'Faroese', 'bogo' ), |
| 58 | 47 | 'fr_FR' => __( 'French (France)', 'bogo' ), |
| 59 | - 'fr_BE' => __( 'French (Belgium)', 'bogo' ), | |
| 60 | - 'fr_CA' => __( 'French (Canada)', 'bogo' ), | |
| 61 | 48 | 'fy' => __( 'Frisian', 'bogo' ), |
| 62 | 49 | 'ga' => __( 'Irish', 'bogo' ), |
| 63 | 50 | 'gd' => __( 'Scottish Gaelic', 'bogo' ), |
| 64 | 51 | 'gl_ES' => __( 'Galician', 'bogo' ), |
| 65 | 52 | 'gu' => __( 'Gujarati', 'bogo' ), |
| 66 | - 'haz' => __( 'Hazaragi', 'bogo' ), | |
| 67 | 53 | 'he_IL' => __( 'Hebrew', 'bogo' ), |
| 68 | 54 | 'hi_IN' => __( 'Hindi', 'bogo' ), |
| 69 | 55 | 'hr' => __( 'Croatian', 'bogo' ), |
| 70 | 56 | 'ht' => __( 'Haitian', 'bogo' ), |
| @@ -95,15 +81,11 @@ | ||
| 95 | 81 | 'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ), |
| 96 | 82 | 'ne_NP' => __( 'Nepali', 'bogo' ), |
| 97 | 83 | 'ni_ID' => __( 'Nias', 'bogo' ), |
| 98 | 84 | 'nl_NL' => __( 'Dutch', 'bogo' ), |
| 99 | - 'nl_NL_formal' => __( 'Dutch (Formal)', 'bogo' ), | |
| 100 | - 'nn_NO' => __( 'Norwegian (Nynorsk)', 'bogo' ), | |
| 101 | - 'oci' => __( 'Occitan', 'bogo' ), | |
| 102 | 85 | 'os' => __( 'Ossetic', 'bogo' ), |
| 103 | 86 | 'pa_IN' => __( 'Punjabi', 'bogo' ), |
| 104 | 87 | 'pl_PL' => __( 'Polish', 'bogo' ), |
| 105 | - 'ps' => __( 'Pashto', 'bogo' ), | |
| 106 | 88 | 'pt_BR' => __( 'Portuguese (Brazil)', 'bogo' ), |
| 107 | 89 | 'pt_PT' => __( 'Portuguese (Portugal)', 'bogo' ), |
| 108 | 90 | 'ro_RO' => __( 'Romanian', 'bogo' ), |
| 109 | 91 | 'ru_RU' => __( 'Russian', 'bogo' ), |
| @@ -132,15 +114,13 @@ | ||
| 132 | 114 | 'zh_CN' => __( 'Chinese (China)', 'bogo' ), |
| 133 | 115 | 'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' ) |
| 134 | 116 | ); |
| 135 | 117 | |
| 136 | - if ( is_textdomain_loaded( 'bogo' ) ) { | |
| 137 | - $textdomain_loaded = true; | |
| 138 | - } | |
| 118 | + asort( $languages, SORT_STRING ); | |
| 139 | 119 | |
| 140 | - asort( $languages, SORT_STRING ); | |
| 120 | + $languages = apply_filters( 'bogo_languages', $languages ); | |
| 141 | 121 | |
| 142 | - return apply_filters( 'bogo_languages', $languages ); | |
| 122 | + return $languages; | |
| 143 | 123 | } |
| 144 | 124 | |
| 145 | 125 | function bogo_get_language( $locale ) { |
| 146 | 126 | $languages = bogo_languages(); |
| @@ -150,30 +130,8 @@ | ||
| 150 | 130 | |
| 151 | 131 | return null; |
| 152 | 132 | } |
| 153 | 133 | |
| 154 | -function bogo_get_language_native_name( $locale ) { | |
| 155 | - if ( 'en_US' == $locale ) { | |
| 156 | - return 'English (United States)'; | |
| 157 | - } | |
| 158 | - | |
| 159 | - if ( ! function_exists( 'wp_get_available_translations' ) ) { | |
| 160 | - require_once ABSPATH . 'wp-admin/includes/translation-install.php'; | |
| 161 | - } | |
| 162 | - | |
| 163 | - static $available_translations = array(); | |
| 164 | - | |
| 165 | - if ( empty( $available_translations ) ) { | |
| 166 | - $available_translations = wp_get_available_translations(); | |
| 167 | - } | |
| 168 | - | |
| 169 | - if ( isset( $available_translations[$locale]['native_name'] ) ) { | |
| 170 | - return $available_translations[$locale]['native_name']; | |
| 171 | - } | |
| 172 | - | |
| 173 | - return false; | |
| 174 | -} | |
| 175 | - | |
| 176 | 134 | function bogo_get_default_locale() { |
| 177 | 135 | if ( defined( 'WPLANG' ) ) { |
| 178 | 136 | $locale = WPLANG; |
| 179 | 137 | } |
| @@ -210,9 +168,8 @@ | ||
| 210 | 168 | |
| 211 | 169 | function bogo_available_locales( $args = '' ) { |
| 212 | 170 | $defaults = array( |
| 213 | 171 | 'exclude' => array(), |
| 214 | - 'exclude_enus_if_inactive' => false, | |
| 215 | 172 | 'current_user_can_access' => false ); |
| 216 | 173 | |
| 217 | 174 | $args = wp_parse_args( $args, $defaults ); |
| 218 | 175 | |
| @@ -217,16 +174,9 @@ | ||
| 217 | 174 | $args = wp_parse_args( $args, $defaults ); |
| 218 | 175 | |
| 219 | 176 | $installed_locales = get_available_languages(); |
| 220 | 177 | $installed_locales[] = bogo_get_default_locale(); |
| 221 | - | |
| 222 | - $exclude_enus = $args['exclude_enus_if_inactive'] | |
| 223 | - && bogo_get_prop( 'enus_deactivated' ); | |
| 224 | - | |
| 225 | - if ( ! $exclude_enus ) { | |
| 226 | - $installed_locales[] = 'en_US'; | |
| 227 | - } | |
| 228 | - | |
| 178 | + $installed_locales[] = 'en_US'; | |
| 229 | 179 | $installed_locales = array_unique( $installed_locales ); |
| 230 | 180 | $installed_locales = array_filter( $installed_locales ); |
| 231 | 181 | |
| 232 | 182 | $available_locales = array(); |
| @@ -301,19 +251,13 @@ | ||
| 301 | 251 | function bogo_filter_locales( $locales, $filter = 'available' ) { |
| 302 | 252 | return array_intersect( $locales, bogo_available_locales() ); |
| 303 | 253 | } |
| 304 | 254 | |
| 305 | -/** | |
| 306 | - * @see http://www.ietf.org/rfc/bcp/bcp47.txt | |
| 307 | - */ | |
| 308 | 255 | function bogo_language_tag( $locale ) { |
| 256 | + // http://www.ietf.org/rfc/bcp/bcp47.txt | |
| 309 | 257 | $tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale ); |
| 310 | 258 | $tag = trim( $tag, '-' ); |
| 311 | 259 | |
| 312 | - if ( '-formal' == substr( $tag, -7 ) ) { | |
| 313 | - $tag = substr( $tag, 0, -7 ); | |
| 314 | - } | |
| 315 | - | |
| 316 | 260 | return apply_filters( 'bogo_language_tag', $tag, $locale ); |
| 317 | 261 | } |
| 318 | 262 | |
| 319 | 263 | function bogo_lang_slug( $locale ) { |
| @@ -421,19 +365,17 @@ | ||
| 421 | 365 | $url .= $_SERVER['HTTP_HOST']; |
| 422 | 366 | $url .= $_SERVER['REQUEST_URI']; |
| 423 | 367 | } |
| 424 | 368 | |
| 425 | - if ( $frag = strstr( $url, '#' ) ) { | |
| 369 | + if ( $frag = strstr( $url, '#' ) ) | |
| 426 | 370 | $url = substr( $url, 0, - strlen( $frag ) ); |
| 427 | - } | |
| 428 | 371 | |
| 429 | 372 | if ( $query = @parse_url( $url, PHP_URL_QUERY ) ) { |
| 430 | 373 | parse_str( $query, $query_vars ); |
| 431 | 374 | |
| 432 | 375 | foreach ( array_keys( $query_vars ) as $qv ) { |
| 433 | - if ( ! get_query_var( $qv ) ) { | |
| 376 | + if ( ! get_query_var( $qv ) ) | |
| 434 | 377 | $url = remove_query_arg( $qv, $url ); |
| 435 | - } | |
| 436 | 378 | } |
| 437 | 379 | } |
| 438 | 380 | } |
| 439 | 381 | |
| @@ -438,18 +380,11 @@ | ||
| 438 | 380 | } |
| 439 | 381 | |
| 440 | 382 | $default_locale = bogo_get_default_locale(); |
| 441 | 383 | |
| 442 | - if ( ! $lang ) { | |
| 384 | + if ( ! $lang ) | |
| 443 | 385 | $lang = $default_locale; |
| 444 | - } | |
| 445 | 386 | |
| 446 | - $use_implicit_lang = apply_filters( 'bogo_use_implicit_lang', true ); | |
| 447 | - | |
| 448 | - $lang_slug = ( $use_implicit_lang && $lang == $default_locale ) | |
| 449 | - ? '' | |
| 450 | - : bogo_lang_slug( $lang ); | |
| 451 | - | |
| 452 | 387 | $home = set_url_scheme( get_option( 'home' ) ); |
| 453 | 388 | $home = trailingslashit( $home ); |
| 454 | 389 | |
| 455 | 390 | $url = remove_query_arg( 'lang', $url ); |
| @@ -454,11 +389,10 @@ | ||
| 454 | 389 | |
| 455 | 390 | $url = remove_query_arg( 'lang', $url ); |
| 456 | 391 | |
| 457 | 392 | if ( ! $args['using_permalinks'] ) { |
| 458 | - if ( $lang_slug ) { | |
| 459 | - $url = add_query_arg( array( 'lang' => $lang_slug ), $url ); | |
| 460 | - } | |
| 393 | + if ( $lang != $default_locale ) | |
| 394 | + $url = add_query_arg( array( 'lang' => bogo_lang_slug( $lang ) ), $url ); | |
| 461 | 395 | |
| 462 | 396 | return $url; |
| 463 | 397 | } |
| 464 | 398 | |
| @@ -463,19 +397,13 @@ | ||
| 463 | 397 | } |
| 464 | 398 | |
| 465 | 399 | $available_languages = array_map( 'bogo_lang_slug', bogo_available_locales() ); |
| 466 | 400 | |
| 467 | - $tail_slashed = ( '/' == substr( $url, -1 ) ); | |
| 468 | - | |
| 469 | 401 | $url = preg_replace( |
| 470 | 402 | '#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#', |
| 471 | - $home . ( $lang_slug ? trailingslashit( $lang_slug ) : '' ), | |
| 403 | + $home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ), | |
| 472 | 404 | trailingslashit( $url ) ); |
| 473 | 405 | |
| 474 | - if ( ! $tail_slashed ) { | |
| 475 | - $url = untrailingslashit( $url ); | |
| 476 | - } | |
| 477 | - | |
| 478 | 406 | return $url; |
| 479 | 407 | } |
| 480 | 408 | |
| 481 | 409 | function bogo_get_lang_from_url( $url = '' ) { |
| @@ -511,11 +439,10 @@ | ||
| 511 | 439 | |
| 512 | 440 | function bogo_get_prop( $prop ) { |
| 513 | 441 | $option = get_option( 'bogo' ); |
| 514 | 442 | |
| 515 | - if ( ! is_array( $option ) ) { | |
| 443 | + if ( ! is_array( $option ) ) | |
| 516 | 444 | $option = array(); |
| 517 | - } | |
| 518 | 445 | |
| 519 | 446 | return isset( $option[$prop] ) ? $option[$prop] : ''; |
| 520 | 447 | } |
| 521 | 448 | |
| @@ -521,11 +448,10 @@ | ||
| 521 | 448 | |
| 522 | 449 | function bogo_set_prop( $prop, $value ) { |
| 523 | 450 | $option = get_option( 'bogo' ); |
| 524 | 451 | |
| 525 | - if ( ! is_array( $option ) ) { | |
| 452 | + if ( ! is_array( $option ) ) | |
| 526 | 453 | $option = array(); |
| 527 | - } | |
| 528 | 454 | |
| 529 | 455 | $option[$prop] = $value; |
| 530 | 456 | |
| 531 | 457 | update_option( 'bogo', $option ); |
| @@ -530,27 +456,5 @@ | ||
| 530 | 456 | |
| 531 | 457 | update_option( 'bogo', $option ); |
| 532 | 458 | } |
| 533 | 459 | |
| 534 | -function bogo_delete_prop( $prop ) { | |
| 535 | - $option = get_option( 'bogo' ); | |
| 536 | - | |
| 537 | - if ( ! is_array( $option ) ) { | |
| 538 | - $option = array(); | |
| 539 | - } | |
| 540 | - | |
| 541 | - if ( isset( $option[$prop] ) ) { | |
| 542 | - unset( $option[$prop] ); | |
| 543 | - } | |
| 544 | - | |
| 545 | - update_option( 'bogo', $option ); | |
| 546 | -} | |
| 547 | - | |
| 548 | -function bogo_plugin_url( $path = '' ) { | |
| 549 | - $url = plugins_url( $path, BOGO_PLUGIN ); | |
| 550 | - | |
| 551 | - if ( is_ssl() && 'http:' == substr( $url, 0, 5 ) ) { | |
| 552 | - $url = 'https:' . substr( $url, 5 ); | |
| 553 | - } | |
| 554 | - | |
| 555 | - return $url; | |
| 556 | -} | |
| 460 | +?> | |
