| @@ -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' ), |
| @@ -27,9 +26,8 @@ | ||
| 27 | 26 | 'cs_CZ' => __( 'Czech', 'bogo' ), |
| 28 | 27 | 'cy' => __( 'Welsh', 'bogo' ), |
| 29 | 28 | 'da_DK' => __( 'Danish', 'bogo' ), |
| 30 | 29 | 'de_DE' => __( 'German', 'bogo' ), |
| 31 | - 'de_CH' => __( 'German (Switzerland)', 'bogo' ), | |
| 32 | 30 | 'dv' => __( 'Dhivehi', 'bogo' ), |
| 33 | 31 | 'el' => __( 'Greek', 'bogo' ), |
| 34 | 32 | 'en_US' => __( 'English (United States)', 'bogo' ), |
| 35 | 33 | 'en_AU' => __( 'English (Australia)', 'bogo' ), |
| @@ -37,9 +35,9 @@ | ||
| 37 | 35 | 'en_GB' => __( 'English (UK)', 'bogo' ), |
| 38 | 36 | 'eo' => __( 'Esperanto', 'bogo' ), |
| 39 | 37 | 'es_ES' => __( 'Spanish (Spain)', 'bogo' ), |
| 40 | 38 | 'es_CL' => __( 'Spanish (Chile)', 'bogo' ), |
| 41 | - 'es_MX' => __( 'Spanish (Mexico)', 'bogo' ), | |
| 39 | + 'es_MX' => __( 'Mexican Spanish', 'bogo' ), | |
| 42 | 40 | 'es_PE' => __( 'Spanish (Peru)', 'bogo' ), |
| 43 | 41 | 'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ), |
| 44 | 42 | 'et' => __( 'Estonian', 'bogo' ), |
| 45 | 43 | 'eu' => __( 'Basque', 'bogo' ), |
| @@ -51,9 +49,8 @@ | ||
| 51 | 49 | 'ga' => __( 'Irish', 'bogo' ), |
| 52 | 50 | 'gd' => __( 'Scottish Gaelic', 'bogo' ), |
| 53 | 51 | 'gl_ES' => __( 'Galician', 'bogo' ), |
| 54 | 52 | 'gu' => __( 'Gujarati', 'bogo' ), |
| 55 | - 'haz' => __( 'Hazaragi', 'bogo' ), | |
| 56 | 53 | 'he_IL' => __( 'Hebrew', 'bogo' ), |
| 57 | 54 | 'hi_IN' => __( 'Hindi', 'bogo' ), |
| 58 | 55 | 'hr' => __( 'Croatian', 'bogo' ), |
| 59 | 56 | 'ht' => __( 'Haitian', 'bogo' ), |
| @@ -117,15 +114,13 @@ | ||
| 117 | 114 | 'zh_CN' => __( 'Chinese (China)', 'bogo' ), |
| 118 | 115 | 'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' ) |
| 119 | 116 | ); |
| 120 | 117 | |
| 121 | - if ( is_textdomain_loaded( 'bogo' ) ) { | |
| 122 | - $textdomain_loaded = true; | |
| 123 | - } | |
| 118 | + asort( $languages, SORT_STRING ); | |
| 124 | 119 | |
| 125 | - asort( $languages, SORT_STRING ); | |
| 120 | + $languages = apply_filters( 'bogo_languages', $languages ); | |
| 126 | 121 | |
| 127 | - return apply_filters( 'bogo_languages', $languages ); | |
| 122 | + return $languages; | |
| 128 | 123 | } |
| 129 | 124 | |
| 130 | 125 | function bogo_get_language( $locale ) { |
| 131 | 126 | $languages = bogo_languages(); |
| @@ -459,17 +454,7 @@ | ||
| 459 | 454 | |
| 460 | 455 | $option[$prop] = $value; |
| 461 | 456 | |
| 462 | 457 | update_option( 'bogo', $option ); |
| 463 | -} | |
| 464 | - | |
| 465 | -function bogo_plugin_url( $path = '' ) { | |
| 466 | - $url = plugins_url( $path, BOGO_PLUGIN ); | |
| 467 | - | |
| 468 | - if ( is_ssl() && 'http:' == substr( $url, 0, 5 ) ) { | |
| 469 | - $url = 'https:' . substr( $url, 5 ); | |
| 470 | - } | |
| 471 | - | |
| 472 | - return $url; | |
| 473 | 458 | } |
| 474 | 459 | |
| 475 | 460 | ?> |
