| @@ -1,83 +1,140 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | function bogo_languages() { |
| 4 | 4 | static $languages = array(); |
| 5 | + static $textdomain_loaded = false; | |
| 5 | 6 | |
| 6 | - if ( ! empty( $languages ) ) { | |
| 7 | - return $languages; | |
| 7 | + if ( $languages && $textdomain_loaded ) { | |
| 8 | + return apply_filters( 'bogo_languages', $languages ); | |
| 8 | 9 | } |
| 9 | 10 | |
| 10 | 11 | $languages = array( |
| 11 | 12 | 'af' => __( 'Afrikaans', 'bogo' ), |
| 13 | + 'am' => __( 'Amharic', 'bogo' ), | |
| 14 | + 'an' => __( 'Aragonese', 'bogo' ), | |
| 12 | 15 | 'ar' => __( 'Arabic', 'bogo' ), |
| 16 | + 'ary' => __( 'Moroccan Arabic', 'bogo' ), | |
| 17 | + 'as' => __( 'Assamese', 'bogo' ), | |
| 18 | + 'az' => __( 'Azerbaijani', 'bogo' ), | |
| 13 | 19 | 'be_BY' => __( 'Belarusian', 'bogo' ), |
| 14 | 20 | 'bg_BG' => __( 'Bulgarian', 'bogo' ), |
| 15 | 21 | 'bn_BD' => __( 'Bangla', 'bogo' ), |
| 22 | + 'bn_IN' => __( 'Indian Bengali', 'bogo' ), | |
| 23 | + 'bo' => __( 'Tibetan', 'bogo' ), | |
| 24 | + 'bs_BA' => __( 'Bosnian', 'bogo' ), | |
| 16 | 25 | 'ca' => __( 'Catalan', 'bogo' ), |
| 26 | + 'ckb' => __( 'Central Kurdish', 'bogo' ), | |
| 27 | + 'co' => __( 'Corsican', 'bogo' ), | |
| 17 | 28 | 'cs_CZ' => __( 'Czech', 'bogo' ), |
| 18 | 29 | 'cy' => __( 'Welsh', 'bogo' ), |
| 19 | 30 | 'da_DK' => __( 'Danish', 'bogo' ), |
| 20 | 31 | 'de_DE' => __( 'German', 'bogo' ), |
| 32 | + 'de_DE_formal' => __( 'German (Formal)', 'bogo' ), | |
| 33 | + 'de_CH' => __( 'German (Switzerland)', 'bogo' ), | |
| 34 | + 'dv' => __( 'Dhivehi', 'bogo' ), | |
| 21 | 35 | 'el' => __( 'Greek', 'bogo' ), |
| 22 | - 'en_GB' => __( 'British English', 'bogo' ), | |
| 23 | - 'en_US' => __( 'English', 'bogo' ), | |
| 36 | + 'en_US' => __( 'English (United States)', 'bogo' ), | |
| 37 | + 'en_AU' => __( 'English (Australia)', 'bogo' ), | |
| 38 | + 'en_CA' => __( 'English (Canada)', 'bogo' ), | |
| 39 | + 'en_GB' => __( 'English (UK)', 'bogo' ), | |
| 40 | + 'en_NZ' => __( 'English (New Zealand)', 'bogo' ), | |
| 41 | + 'en_ZA' => __( 'English (South Africa)', 'bogo' ), | |
| 24 | 42 | 'eo' => __( 'Esperanto', 'bogo' ), |
| 25 | - 'es_ES' => __( 'Spanish', 'bogo' ), | |
| 43 | + 'es_ES' => __( 'Spanish (Spain)', 'bogo' ), | |
| 44 | + 'es_CL' => __( 'Spanish (Chile)', 'bogo' ), | |
| 45 | + 'es_CO' => __( 'Spanish (Colombia)', 'bogo' ), | |
| 46 | + 'es_MX' => __( 'Spanish (Mexico)', 'bogo' ), | |
| 47 | + 'es_PE' => __( 'Spanish (Peru)', 'bogo' ), | |
| 48 | + 'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ), | |
| 26 | 49 | 'et' => __( 'Estonian', 'bogo' ), |
| 27 | 50 | 'eu' => __( 'Basque', 'bogo' ), |
| 28 | 51 | 'fa_IR' => __( 'Persian', 'bogo' ), |
| 29 | 52 | 'fi' => __( 'Finnish', 'bogo' ), |
| 30 | 53 | 'fo' => __( 'Faroese', 'bogo' ), |
| 31 | - 'fr_FR' => __( 'French', 'bogo' ), | |
| 32 | - 'ge_GE' => __( 'Georgian', 'bogo' ), | |
| 54 | + 'fr_FR' => __( 'French (France)', 'bogo' ), | |
| 55 | + 'fr_BE' => __( 'French (Belgium)', 'bogo' ), | |
| 56 | + 'fy' => __( 'Frisian', 'bogo' ), | |
| 57 | + 'ga' => __( 'Irish', 'bogo' ), | |
| 58 | + 'gd' => __( 'Scottish Gaelic', 'bogo' ), | |
| 33 | 59 | 'gl_ES' => __( 'Galician', 'bogo' ), |
| 34 | - 'ht' => __( 'Haitian', 'bogo' ), | |
| 60 | + 'gu' => __( 'Gujarati', 'bogo' ), | |
| 61 | + 'haz' => __( 'Hazaragi', 'bogo' ), | |
| 35 | 62 | 'he_IL' => __( 'Hebrew', 'bogo' ), |
| 63 | + 'hi_IN' => __( 'Hindi', 'bogo' ), | |
| 36 | 64 | 'hr' => __( 'Croatian', 'bogo' ), |
| 65 | + 'ht' => __( 'Haitian', 'bogo' ), | |
| 37 | 66 | 'hu_HU' => __( 'Hungarian', 'bogo' ), |
| 67 | + 'hy' => __( 'Armenian', 'bogo' ), | |
| 38 | 68 | 'id_ID' => __( 'Indonesian', 'bogo' ), |
| 39 | - 'ga_IE' => __( 'Irish', 'bogo' ), | |
| 40 | 69 | 'is_IS' => __( 'Icelandic', 'bogo' ), |
| 41 | 70 | 'it_IT' => __( 'Italian', 'bogo' ), |
| 42 | 71 | 'ja' => __( 'Japanese', 'bogo' ), |
| 72 | + 'jv_ID' => __( 'Javanese', 'bogo' ), | |
| 73 | + 'ka_GE' => __( 'Georgian', 'bogo' ), | |
| 74 | + 'kk' => __( 'Kazakh', 'bogo' ), | |
| 43 | 75 | 'km_KH' => __( 'Khmer', 'bogo' ), |
| 76 | + 'kn' => __( 'Kannada', 'bogo' ), | |
| 44 | 77 | 'ko_KR' => __( 'Korean', 'bogo' ), |
| 78 | + 'li' => __( 'Limburgish', 'bogo' ), | |
| 79 | + 'lo' => __( 'Lao', 'bogo' ), | |
| 45 | 80 | 'lt_LT' => __( 'Lithuanian', 'bogo' ), |
| 46 | 81 | 'lv' => __( 'Latvian', 'bogo' ), |
| 47 | 82 | 'mg_MG' => __( 'Malagasy', 'bogo' ), |
| 48 | 83 | 'mk_MK' => __( 'Macedonian', 'bogo' ), |
| 49 | - 'mn_MN' => __( 'Mongolian', 'bogo' ), | |
| 84 | + 'ml_IN' => __( 'Malayalam', 'bogo' ), | |
| 85 | + 'mn' => __( 'Mongolian', 'bogo' ), | |
| 86 | + 'mr' => __( 'Marathi', 'bogo' ), | |
| 50 | 87 | 'ms_MY' => __( 'Malay', 'bogo' ), |
| 51 | - 'nb_NO' => __( 'Norwegian', 'bogo' ), | |
| 88 | + 'mt_MT' => __( 'Maltese', 'bogo' ), | |
| 89 | + 'my_MM' => __( 'Burmese', 'bogo' ), | |
| 90 | + 'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ), | |
| 91 | + 'ne_NP' => __( 'Nepali', 'bogo' ), | |
| 52 | 92 | 'ni_ID' => __( 'Nias', 'bogo' ), |
| 53 | 93 | 'nl_NL' => __( 'Dutch', 'bogo' ), |
| 94 | + 'nn_NO' => __( 'Norwegian (Nynorsk)', 'bogo' ), | |
| 95 | + 'oci' => __( 'Occitan', 'bogo' ), | |
| 96 | + 'os' => __( 'Ossetic', 'bogo' ), | |
| 97 | + 'pa_IN' => __( 'Punjabi', 'bogo' ), | |
| 54 | 98 | 'pl_PL' => __( 'Polish', 'bogo' ), |
| 55 | - 'pt_BR' => __( 'Brazilian Portuguese', 'bogo' ), | |
| 56 | - 'pt_PT' => __( 'Portuguese', 'bogo' ), | |
| 99 | + 'ps' => __( 'Pashto', 'bogo' ), | |
| 100 | + 'pt_BR' => __( 'Portuguese (Brazil)', 'bogo' ), | |
| 101 | + 'pt_PT' => __( 'Portuguese (Portugal)', 'bogo' ), | |
| 57 | 102 | 'ro_RO' => __( 'Romanian', 'bogo' ), |
| 58 | 103 | 'ru_RU' => __( 'Russian', 'bogo' ), |
| 104 | + 'sa_IN' => __( 'Sanskrit', 'bogo' ), | |
| 59 | 105 | 'si_LK' => __( 'Sinhala', 'bogo' ), |
| 60 | 106 | 'sk_SK' => __( 'Slovak', 'bogo' ), |
| 61 | 107 | 'sl_SI' => __( 'Slovenian', 'bogo' ), |
| 108 | + 'so_SO' => __( 'Somali', 'bogo' ), | |
| 62 | 109 | 'sq' => __( 'Albanian', 'bogo' ), |
| 63 | 110 | 'sr_RS' => __( 'Serbian', 'bogo' ), |
| 64 | 111 | 'sv_SE' => __( 'Swedish', 'bogo' ), |
| 65 | 112 | 'su_ID' => __( 'Sundanese', 'bogo' ), |
| 113 | + 'sw' => __( 'Swahili', 'bogo' ), | |
| 114 | + 'ta_IN' => __( 'Tamil', 'bogo' ), | |
| 115 | + 'te' => __( 'Telugu', 'bogo' ), | |
| 66 | 116 | 'tg' => __( 'Tajik', 'bogo' ), |
| 67 | 117 | 'th' => __( 'Thai', 'bogo' ), |
| 68 | 118 | 'tl' => __( 'Tagalog', 'bogo' ), |
| 69 | - 'tr' => __( 'Turkish', 'bogo' ), | |
| 119 | + 'tr_TR' => __( 'Turkish', 'bogo' ), | |
| 120 | + 'tt_RU' => __( 'Tatar', 'bogo' ), | |
| 121 | + 'ug_CN' => __( 'Uighur', 'bogo' ), | |
| 70 | 122 | 'uk' => __( 'Ukrainian', 'bogo' ), |
| 123 | + 'ur' => __( 'Urdu', 'bogo' ), | |
| 71 | 124 | 'uz_UZ' => __( 'Uzbek', 'bogo' ), |
| 72 | 125 | 'vi' => __( 'Vietnamese', 'bogo' ), |
| 73 | - 'zh_CN' => __( 'Chinese', 'bogo' ), | |
| 74 | - 'zh_TW' => __( 'Traditional Chinese', 'bogo' ) | |
| 126 | + 'zh_CN' => __( 'Chinese (China)', 'bogo' ), | |
| 127 | + 'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' ) | |
| 75 | 128 | ); |
| 76 | 129 | |
| 77 | - $languages = apply_filters( 'bogo_languages', $languages ); | |
| 130 | + if ( is_textdomain_loaded( 'bogo' ) ) { | |
| 131 | + $textdomain_loaded = true; | |
| 132 | + } | |
| 78 | 133 | |
| 79 | - return $languages; | |
| 134 | + asort( $languages, SORT_STRING ); | |
| 135 | + | |
| 136 | + return apply_filters( 'bogo_languages', $languages ); | |
| 80 | 137 | } |
| 81 | 138 | |
| 82 | 139 | function bogo_get_language( $locale ) { |
| 83 | 140 | $languages = bogo_languages(); |
| @@ -87,22 +144,55 @@ | ||
| 87 | 144 | |
| 88 | 145 | return null; |
| 89 | 146 | } |
| 90 | 147 | |
| 148 | +function bogo_get_language_native_name( $locale ) { | |
| 149 | + if ( 'en_US' == $locale ) { | |
| 150 | + return 'English (United States)'; | |
| 151 | + } | |
| 152 | + | |
| 153 | + if ( ! function_exists( 'wp_get_available_translations' ) ) { | |
| 154 | + require_once ABSPATH . 'wp-admin/includes/translation-install.php'; | |
| 155 | + } | |
| 156 | + | |
| 157 | + static $available_translations = array(); | |
| 158 | + | |
| 159 | + if ( empty( $available_translations ) ) { | |
| 160 | + $available_translations = wp_get_available_translations(); | |
| 161 | + } | |
| 162 | + | |
| 163 | + if ( isset( $available_translations[$locale]['native_name'] ) ) { | |
| 164 | + return $available_translations[$locale]['native_name']; | |
| 165 | + } | |
| 166 | + | |
| 167 | + return false; | |
| 168 | +} | |
| 169 | + | |
| 91 | 170 | function bogo_get_default_locale() { |
| 92 | - if ( defined( 'WPLANG' ) ) | |
| 171 | + if ( defined( 'WPLANG' ) ) { | |
| 93 | 172 | $locale = WPLANG; |
| 173 | + } | |
| 94 | 174 | |
| 95 | 175 | if ( is_multisite() ) { |
| 96 | - if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) | |
| 176 | + if ( defined( 'WP_INSTALLING' ) | |
| 177 | + || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) { | |
| 97 | 178 | $ms_locale = get_site_option( 'WPLANG' ); |
| 179 | + } | |
| 98 | 180 | |
| 99 | - if ( $ms_locale !== false ) | |
| 181 | + if ( $ms_locale !== false ) { | |
| 100 | 182 | $locale = $ms_locale; |
| 183 | + } | |
| 184 | + } else { | |
| 185 | + $db_locale = get_option( 'WPLANG' ); | |
| 186 | + | |
| 187 | + if ( $db_locale !== false ) { | |
| 188 | + $locale = $db_locale; | |
| 189 | + } | |
| 101 | 190 | } |
| 102 | 191 | |
| 103 | - if ( empty( $locale ) ) | |
| 192 | + if ( empty( $locale ) ) { | |
| 104 | 193 | $locale = 'en_US'; |
| 194 | + } | |
| 105 | 195 | |
| 106 | 196 | return $locale; |
| 107 | 197 | } |
| 108 | 198 | |
| @@ -111,46 +201,77 @@ | ||
| 111 | 201 | |
| 112 | 202 | return ! empty( $locale ) && $locale == bogo_get_default_locale(); |
| 113 | 203 | } |
| 114 | 204 | |
| 115 | -function bogo_available_languages( $args = '' ) { | |
| 205 | +function bogo_available_locales( $args = '' ) { | |
| 116 | 206 | $defaults = array( |
| 117 | 207 | 'exclude' => array(), |
| 118 | - 'orderby' => 'key', | |
| 119 | - 'order' => 'ASC' ); | |
| 208 | + 'exclude_enus_if_inactive' => false, | |
| 209 | + 'current_user_can_access' => false ); | |
| 120 | 210 | |
| 121 | 211 | $args = wp_parse_args( $args, $defaults ); |
| 122 | 212 | |
| 123 | - $langs = array(); | |
| 124 | - | |
| 125 | 213 | $installed_locales = get_available_languages(); |
| 126 | 214 | $installed_locales[] = bogo_get_default_locale(); |
| 127 | - $installed_locales[] = 'en_US'; | |
| 215 | + | |
| 216 | + $exclude_enus = $args['exclude_enus_if_inactive'] | |
| 217 | + && bogo_get_prop( 'enus_deactivated' ); | |
| 218 | + | |
| 219 | + if ( ! $exclude_enus ) { | |
| 220 | + $installed_locales[] = 'en_US'; | |
| 221 | + } | |
| 222 | + | |
| 128 | 223 | $installed_locales = array_unique( $installed_locales ); |
| 129 | 224 | $installed_locales = array_filter( $installed_locales ); |
| 130 | 225 | |
| 226 | + $available_locales = array(); | |
| 227 | + | |
| 131 | 228 | foreach ( $installed_locales as $locale ) { |
| 132 | - if ( in_array( $locale, (array) $args['exclude'] ) ) | |
| 229 | + if ( in_array( $locale, (array) $args['exclude'] ) ) { | |
| 133 | 230 | continue; |
| 231 | + } | |
| 134 | 232 | |
| 135 | - $lang = bogo_get_language( $locale ); | |
| 233 | + if ( $args['current_user_can_access'] | |
| 234 | + && ! current_user_can( 'bogo_access_locale', $locale ) ) { | |
| 235 | + continue; | |
| 236 | + } | |
| 136 | 237 | |
| 137 | - if ( empty( $lang ) ) | |
| 138 | - $lang = "[$locale]"; | |
| 238 | + $available_locales[] = $locale; | |
| 239 | + } | |
| 139 | 240 | |
| 140 | - $langs[$locale] = $lang; | |
| 241 | + return $available_locales; | |
| 242 | +} | |
| 243 | + | |
| 244 | +function bogo_available_languages( $args = '' ) { | |
| 245 | + $defaults = array( | |
| 246 | + 'exclude' => array(), | |
| 247 | + 'orderby' => 'key', | |
| 248 | + 'order' => 'ASC', | |
| 249 | + 'current_user_can_access' => false ); | |
| 250 | + | |
| 251 | + $args = wp_parse_args( $args, $defaults ); | |
| 252 | + | |
| 253 | + $langs = array(); | |
| 254 | + | |
| 255 | + $available_locales = bogo_available_locales( $args ); | |
| 256 | + | |
| 257 | + foreach ( $available_locales as $locale ) { | |
| 258 | + $lang = bogo_get_language( $locale ); | |
| 259 | + $langs[$locale] = empty( $lang ) ? "[$locale]" : $lang; | |
| 141 | 260 | } |
| 142 | 261 | |
| 143 | 262 | if ( 'value' == $args['orderby'] ) { |
| 144 | 263 | natcasesort( $langs ); |
| 145 | 264 | |
| 146 | - if ( 'DESC' == $args['order'] ) | |
| 265 | + if ( 'DESC' == $args['order'] ) { | |
| 147 | 266 | $langs = array_reverse( $langs ); |
| 267 | + } | |
| 148 | 268 | } else { |
| 149 | - if ( 'DESC' == $args['order'] ) | |
| 269 | + if ( 'DESC' == $args['order'] ) { | |
| 150 | 270 | krsort( $langs ); |
| 151 | - else | |
| 271 | + } else { | |
| 152 | 272 | ksort( $langs ); |
| 273 | + } | |
| 153 | 274 | } |
| 154 | 275 | |
| 155 | 276 | $langs = apply_filters( 'bogo_available_languages', $langs, $args ); |
| 156 | 277 | |
| @@ -157,11 +278,25 @@ | ||
| 157 | 278 | return $langs; |
| 158 | 279 | } |
| 159 | 280 | |
| 160 | 281 | function bogo_is_available_locale( $locale ) { |
| 161 | - return ! empty( $locale ) && array_key_exists( $locale, (array) bogo_available_languages() ); | |
| 282 | + if ( empty( $locale ) ) { | |
| 283 | + return false; | |
| 284 | + } | |
| 285 | + | |
| 286 | + static $available_locales = array(); | |
| 287 | + | |
| 288 | + if ( empty( $available_locales ) ) { | |
| 289 | + $available_locales = bogo_available_locales(); | |
| 290 | + } | |
| 291 | + | |
| 292 | + return in_array( $locale, $available_locales ); | |
| 162 | 293 | } |
| 163 | 294 | |
| 295 | +function bogo_filter_locales( $locales, $filter = 'available' ) { | |
| 296 | + return array_intersect( $locales, bogo_available_locales() ); | |
| 297 | +} | |
| 298 | + | |
| 164 | 299 | function bogo_language_tag( $locale ) { |
| 165 | 300 | // http://www.ietf.org/rfc/bcp/bcp47.txt |
| 166 | 301 | $tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale ); |
| 167 | 302 | $tag = trim( $tag, '-' ); |
| @@ -175,9 +310,9 @@ | ||
| 175 | 310 | |
| 176 | 311 | if ( false !== $pos = strpos( $tag, '-' ) ) |
| 177 | 312 | $slug = substr( $tag, 0, $pos ); |
| 178 | 313 | |
| 179 | - $variations = preg_grep( '/^' . $slug . '/', array_keys( bogo_available_languages() ) ); | |
| 314 | + $variations = preg_grep( '/^' . $slug . '/', bogo_available_locales() ); | |
| 180 | 315 | |
| 181 | 316 | if ( 1 < count( $variations ) ) |
| 182 | 317 | $slug = $tag; |
| 183 | 318 | |
| @@ -184,10 +319,9 @@ | ||
| 184 | 319 | return apply_filters( 'bogo_lang_slug', $slug, $locale ); |
| 185 | 320 | } |
| 186 | 321 | |
| 187 | 322 | function bogo_get_lang_regex() { |
| 188 | - $langs = array_keys( bogo_available_languages() ); | |
| 189 | - $langs = array_map( 'bogo_lang_slug', $langs ); | |
| 323 | + $langs = array_map( 'bogo_lang_slug', bogo_available_locales() ); | |
| 190 | 324 | $langs = array_filter( $langs ); |
| 191 | 325 | |
| 192 | 326 | if ( empty( $langs ) ) |
| 193 | 327 | return ''; |
| @@ -203,9 +337,9 @@ | ||
| 203 | 337 | |
| 204 | 338 | $language_code = $matches[1]; |
| 205 | 339 | $region_code = isset( $matches[2] ) ? $matches[2] : ''; |
| 206 | 340 | |
| 207 | - $locales = array_keys( bogo_available_languages() ); | |
| 341 | + $locales = bogo_available_locales(); | |
| 208 | 342 | |
| 209 | 343 | if ( $region_code ) { |
| 210 | 344 | $locale = $language_code . '_' . strtoupper( $region_code ); |
| 211 | 345 | |
| @@ -275,17 +409,19 @@ | ||
| 275 | 409 | $url .= $_SERVER['HTTP_HOST']; |
| 276 | 410 | $url .= $_SERVER['REQUEST_URI']; |
| 277 | 411 | } |
| 278 | 412 | |
| 279 | - if ( $frag = strstr( $url, '#' ) ) | |
| 413 | + if ( $frag = strstr( $url, '#' ) ) { | |
| 280 | 414 | $url = substr( $url, 0, - strlen( $frag ) ); |
| 415 | + } | |
| 281 | 416 | |
| 282 | 417 | if ( $query = @parse_url( $url, PHP_URL_QUERY ) ) { |
| 283 | 418 | parse_str( $query, $query_vars ); |
| 284 | 419 | |
| 285 | 420 | foreach ( array_keys( $query_vars ) as $qv ) { |
| 286 | - if ( ! get_query_var( $qv ) ) | |
| 421 | + if ( ! get_query_var( $qv ) ) { | |
| 287 | 422 | $url = remove_query_arg( $qv, $url ); |
| 423 | + } | |
| 288 | 424 | } |
| 289 | 425 | } |
| 290 | 426 | } |
| 291 | 427 | |
| @@ -290,10 +426,11 @@ | ||
| 290 | 426 | } |
| 291 | 427 | |
| 292 | 428 | $default_locale = bogo_get_default_locale(); |
| 293 | 429 | |
| 294 | - if ( ! $lang ) | |
| 430 | + if ( ! $lang ) { | |
| 295 | 431 | $lang = $default_locale; |
| 432 | + } | |
| 296 | 433 | |
| 297 | 434 | $home = set_url_scheme( get_option( 'home' ) ); |
| 298 | 435 | $home = trailingslashit( $home ); |
| 299 | 436 | |
| @@ -299,22 +436,28 @@ | ||
| 299 | 436 | |
| 300 | 437 | $url = remove_query_arg( 'lang', $url ); |
| 301 | 438 | |
| 302 | 439 | if ( ! $args['using_permalinks'] ) { |
| 303 | - if ( $lang != $default_locale ) | |
| 440 | + if ( $lang != $default_locale ) { | |
| 304 | 441 | $url = add_query_arg( array( 'lang' => bogo_lang_slug( $lang ) ), $url ); |
| 442 | + } | |
| 305 | 443 | |
| 306 | 444 | return $url; |
| 307 | 445 | } |
| 308 | 446 | |
| 309 | - $available_languages = array_keys( bogo_available_languages() ); | |
| 310 | - $available_languages = array_map( 'bogo_lang_slug', $available_languages ); | |
| 447 | + $available_languages = array_map( 'bogo_lang_slug', bogo_available_locales() ); | |
| 311 | 448 | |
| 449 | + $tail_slashed = ( '/' == substr( $url, -1 ) ); | |
| 450 | + | |
| 312 | 451 | $url = preg_replace( |
| 313 | 452 | '#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#', |
| 314 | 453 | $home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ), |
| 315 | 454 | trailingslashit( $url ) ); |
| 316 | 455 | |
| 456 | + if ( ! $tail_slashed ) { | |
| 457 | + $url = untrailingslashit( $url ); | |
| 458 | + } | |
| 459 | + | |
| 317 | 460 | return $url; |
| 318 | 461 | } |
| 319 | 462 | |
| 320 | 463 | function bogo_get_lang_from_url( $url = '' ) { |
| @@ -329,10 +472,9 @@ | ||
| 329 | 472 | |
| 330 | 473 | $home = set_url_scheme( get_option( 'home' ) ); |
| 331 | 474 | $home = trailingslashit( $home ); |
| 332 | 475 | |
| 333 | - $available_languages = array_keys( bogo_available_languages() ); | |
| 334 | - $available_languages = array_map( 'bogo_lang_slug', $available_languages ); | |
| 476 | + $available_languages = array_map( 'bogo_lang_slug', bogo_available_locales() ); | |
| 335 | 477 | |
| 336 | 478 | $regex = '#^' . preg_quote( $home ) . '(' . implode( '|', $available_languages ) . ')/#'; |
| 337 | 479 | |
| 338 | 480 | if ( preg_match( $regex, trailingslashit( $url ), $matches ) ) |
| @@ -351,10 +493,11 @@ | ||
| 351 | 493 | |
| 352 | 494 | function bogo_get_prop( $prop ) { |
| 353 | 495 | $option = get_option( 'bogo' ); |
| 354 | 496 | |
| 355 | - if ( ! is_array( $option ) ) | |
| 497 | + if ( ! is_array( $option ) ) { | |
| 356 | 498 | $option = array(); |
| 499 | + } | |
| 357 | 500 | |
| 358 | 501 | return isset( $option[$prop] ) ? $option[$prop] : ''; |
| 359 | 502 | } |
| 360 | 503 | |
| @@ -360,10 +503,11 @@ | ||
| 360 | 503 | |
| 361 | 504 | function bogo_set_prop( $prop, $value ) { |
| 362 | 505 | $option = get_option( 'bogo' ); |
| 363 | 506 | |
| 364 | - if ( ! is_array( $option ) ) | |
| 507 | + if ( ! is_array( $option ) ) { | |
| 365 | 508 | $option = array(); |
| 509 | + } | |
| 366 | 510 | |
| 367 | 511 | $option[$prop] = $value; |
| 368 | 512 | |
| 369 | 513 | update_option( 'bogo', $option ); |
| @@ -368,5 +512,27 @@ | ||
| 368 | 512 | |
| 369 | 513 | update_option( 'bogo', $option ); |
| 370 | 514 | } |
| 371 | 515 | |
| 372 | -?> | |
| 516 | +function bogo_delete_prop( $prop ) { | |
| 517 | + $option = get_option( 'bogo' ); | |
| 518 | + | |
| 519 | + if ( ! is_array( $option ) ) { | |
| 520 | + $option = array(); | |
| 521 | + } | |
| 522 | + | |
| 523 | + if ( isset( $option[$prop] ) ) { | |
| 524 | + unset( $option[$prop] ); | |
| 525 | + } | |
| 526 | + | |
| 527 | + update_option( 'bogo', $option ); | |
| 528 | +} | |
| 529 | + | |
| 530 | +function bogo_plugin_url( $path = '' ) { | |
| 531 | + $url = plugins_url( $path, BOGO_PLUGIN ); | |
| 532 | + | |
| 533 | + if ( is_ssl() && 'http:' == substr( $url, 0, 5 ) ) { | |
| 534 | + $url = 'https:' . substr( $url, 5 ); | |
| 535 | + } | |
| 536 | + | |
| 537 | + return $url; | |
| 538 | +} | |