| @@ -15,9 +15,8 @@ | ||
| 15 | 15 | 'ar' => __( 'Arabic', 'bogo' ), |
| 16 | 16 | 'ary' => __( 'Moroccan Arabic', 'bogo' ), |
| 17 | 17 | 'as' => __( 'Assamese', 'bogo' ), |
| 18 | 18 | 'az' => __( 'Azerbaijani', 'bogo' ), |
| 19 | - 'azb' => __( 'South Azerbaijani', 'bogo' ), | |
| 20 | 19 | 'be_BY' => __( 'Belarusian', 'bogo' ), |
| 21 | 20 | 'bg_BG' => __( 'Bulgarian', 'bogo' ), |
| 22 | 21 | 'bn_BD' => __( 'Bangla', 'bogo' ), |
| 23 | 22 | 'bn_IN' => __( 'Indian Bengali', 'bogo' ), |
| @@ -23,9 +22,8 @@ | ||
| 23 | 22 | 'bn_IN' => __( 'Indian Bengali', 'bogo' ), |
| 24 | 23 | 'bo' => __( 'Tibetan', 'bogo' ), |
| 25 | 24 | 'bs_BA' => __( 'Bosnian', 'bogo' ), |
| 26 | 25 | 'ca' => __( 'Catalan', 'bogo' ), |
| 27 | - 'ceb' => __( 'Cebuano', 'bogo' ), | |
| 28 | 26 | 'ckb' => __( 'Central Kurdish', 'bogo' ), |
| 29 | 27 | 'co' => __( 'Corsican', 'bogo' ), |
| 30 | 28 | 'cs_CZ' => __( 'Czech', 'bogo' ), |
| 31 | 29 | 'cy' => __( 'Welsh', 'bogo' ), |
| @@ -42,12 +40,10 @@ | ||
| 42 | 40 | 'en_NZ' => __( 'English (New Zealand)', 'bogo' ), |
| 43 | 41 | 'en_ZA' => __( 'English (South Africa)', 'bogo' ), |
| 44 | 42 | 'eo' => __( 'Esperanto', 'bogo' ), |
| 45 | 43 | 'es_ES' => __( 'Spanish (Spain)', 'bogo' ), |
| 46 | - 'es_AR' => __( 'Spanish (Argentina)', 'bogo' ), | |
| 47 | 44 | 'es_CL' => __( 'Spanish (Chile)', 'bogo' ), |
| 48 | 45 | 'es_CO' => __( 'Spanish (Colombia)', 'bogo' ), |
| 49 | - 'es_GT' => __( 'Spanish (Guatemala)', 'bogo' ), | |
| 50 | 46 | 'es_MX' => __( 'Spanish (Mexico)', 'bogo' ), |
| 51 | 47 | 'es_PE' => __( 'Spanish (Peru)', 'bogo' ), |
| 52 | 48 | 'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ), |
| 53 | 49 | 'et' => __( 'Estonian', 'bogo' ), |
| @@ -56,9 +52,8 @@ | ||
| 56 | 52 | 'fi' => __( 'Finnish', 'bogo' ), |
| 57 | 53 | 'fo' => __( 'Faroese', 'bogo' ), |
| 58 | 54 | 'fr_FR' => __( 'French (France)', 'bogo' ), |
| 59 | 55 | 'fr_BE' => __( 'French (Belgium)', 'bogo' ), |
| 60 | - 'fr_CA' => __( 'French (Canada)', 'bogo' ), | |
| 61 | 56 | 'fy' => __( 'Frisian', 'bogo' ), |
| 62 | 57 | 'ga' => __( 'Irish', 'bogo' ), |
| 63 | 58 | 'gd' => __( 'Scottish Gaelic', 'bogo' ), |
| 64 | 59 | 'gl_ES' => __( 'Galician', 'bogo' ), |
| @@ -95,9 +90,8 @@ | ||
| 95 | 90 | 'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ), |
| 96 | 91 | 'ne_NP' => __( 'Nepali', 'bogo' ), |
| 97 | 92 | 'ni_ID' => __( 'Nias', 'bogo' ), |
| 98 | 93 | 'nl_NL' => __( 'Dutch', 'bogo' ), |
| 99 | - 'nl_NL_formal' => __( 'Dutch (Formal)', 'bogo' ), | |
| 100 | 94 | 'nn_NO' => __( 'Norwegian (Nynorsk)', 'bogo' ), |
| 101 | 95 | 'oci' => __( 'Occitan', 'bogo' ), |
| 102 | 96 | 'os' => __( 'Ossetic', 'bogo' ), |
| 103 | 97 | 'pa_IN' => __( 'Punjabi', 'bogo' ), |
| @@ -301,19 +295,13 @@ | ||
| 301 | 295 | function bogo_filter_locales( $locales, $filter = 'available' ) { |
| 302 | 296 | return array_intersect( $locales, bogo_available_locales() ); |
| 303 | 297 | } |
| 304 | 298 | |
| 305 | -/** | |
| 306 | - * @see http://www.ietf.org/rfc/bcp/bcp47.txt | |
| 307 | - */ | |
| 308 | 299 | function bogo_language_tag( $locale ) { |
| 300 | + // http://www.ietf.org/rfc/bcp/bcp47.txt | |
| 309 | 301 | $tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale ); |
| 310 | 302 | $tag = trim( $tag, '-' ); |
| 311 | 303 | |
| 312 | - if ( '-formal' == substr( $tag, -7 ) ) { | |
| 313 | - $tag = substr( $tag, 0, -7 ); | |
| 314 | - } | |
| 315 | - | |
| 316 | 304 | return apply_filters( 'bogo_language_tag', $tag, $locale ); |
| 317 | 305 | } |
| 318 | 306 | |
| 319 | 307 | function bogo_lang_slug( $locale ) { |
| @@ -442,14 +430,8 @@ | ||
| 442 | 430 | if ( ! $lang ) { |
| 443 | 431 | $lang = $default_locale; |
| 444 | 432 | } |
| 445 | 433 | |
| 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 | 434 | $home = set_url_scheme( get_option( 'home' ) ); |
| 453 | 435 | $home = trailingslashit( $home ); |
| 454 | 436 | |
| 455 | 437 | $url = remove_query_arg( 'lang', $url ); |
| @@ -454,10 +436,10 @@ | ||
| 454 | 436 | |
| 455 | 437 | $url = remove_query_arg( 'lang', $url ); |
| 456 | 438 | |
| 457 | 439 | if ( ! $args['using_permalinks'] ) { |
| 458 | - if ( $lang_slug ) { | |
| 459 | - $url = add_query_arg( array( 'lang' => $lang_slug ), $url ); | |
| 440 | + if ( $lang != $default_locale ) { | |
| 441 | + $url = add_query_arg( array( 'lang' => bogo_lang_slug( $lang ) ), $url ); | |
| 460 | 442 | } |
| 461 | 443 | |
| 462 | 444 | return $url; |
| 463 | 445 | } |
| @@ -467,9 +449,9 @@ | ||
| 467 | 449 | $tail_slashed = ( '/' == substr( $url, -1 ) ); |
| 468 | 450 | |
| 469 | 451 | $url = preg_replace( |
| 470 | 452 | '#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#', |
| 471 | - $home . ( $lang_slug ? trailingslashit( $lang_slug ) : '' ), | |
| 453 | + $home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ), | |
| 472 | 454 | trailingslashit( $url ) ); |
| 473 | 455 | |
| 474 | 456 | if ( ! $tail_slashed ) { |
| 475 | 457 | $url = untrailingslashit( $url ); |
