← All changes | includes/functions.php +158 -36 2.3 → 2.9 View file →

		@@ -1,11 +1,12 @@
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' ),
		@@ -11,17 +12,20 @@
11	12	'af' => __( 'Afrikaans', 'bogo' ),
12	13	'am' => __( 'Amharic', 'bogo' ),
13	14	'an' => __( 'Aragonese', 'bogo' ),
14	15	'ar' => __( 'Arabic', 'bogo' ),
	16	+ 'ary' => __( 'Moroccan Arabic', 'bogo' ),
15	17	'as' => __( 'Assamese', 'bogo' ),
16	18	'az' => __( 'Azerbaijani', 'bogo' ),
	19	+ 'azb' => __( 'South Azerbaijani', 'bogo' ),
17	20	'be_BY' => __( 'Belarusian', 'bogo' ),
18	21	'bg_BG' => __( 'Bulgarian', 'bogo' ),
19	22	'bn_BD' => __( 'Bangla', 'bogo' ),
20	23	'bn_IN' => __( 'Indian Bengali', 'bogo' ),
21	24	'bo' => __( 'Tibetan', 'bogo' ),
22		- 'bs' => __( 'Bosnian', 'bogo' ),
	25	+ 'bs_BA' => __( 'Bosnian', 'bogo' ),
23	26	'ca' => __( 'Catalan', 'bogo' ),
	27	+ 'ceb' => __( 'Cebuano', 'bogo' ),
24	28	'ckb' => __( 'Central Kurdish', 'bogo' ),
25	29	'co' => __( 'Corsican', 'bogo' ),
26	30	'cs_CZ' => __( 'Czech', 'bogo' ),
27	31	'cy' => __( 'Welsh', 'bogo' ),
		@@ -26,31 +30,42 @@
26	30	'cs_CZ' => __( 'Czech', 'bogo' ),
27	31	'cy' => __( 'Welsh', 'bogo' ),
28	32	'da_DK' => __( 'Danish', 'bogo' ),
29	33	'de_DE' => __( 'German', 'bogo' ),
	34	+ 'de_DE_formal' => __( 'German (Formal)', 'bogo' ),
	35	+ 'de_CH' => __( 'German (Switzerland)', 'bogo' ),
	36	+ 'de_CH_informal' => __( 'German (Switzerland) (Informal)', 'bogo' ),
30	37	'dv' => __( 'Dhivehi', 'bogo' ),
31	38	'el' => __( 'Greek', 'bogo' ),
32		- 'en_US' => __( 'English', 'bogo' ),
33		- 'en_AU' => __( 'Australian English', 'bogo' ),
34		- 'en_CA' => __( 'Canadian English', 'bogo' ),
35		- 'en_GB' => __( 'British English', 'bogo' ),
	39	+ 'en_US' => __( 'English (United States)', 'bogo' ),
	40	+ 'en_AU' => __( 'English (Australia)', 'bogo' ),
	41	+ 'en_CA' => __( 'English (Canada)', 'bogo' ),
	42	+ 'en_GB' => __( 'English (UK)', 'bogo' ),
	43	+ 'en_NZ' => __( 'English (New Zealand)', 'bogo' ),
	44	+ 'en_ZA' => __( 'English (South Africa)', 'bogo' ),
36	45	'eo' => __( 'Esperanto', 'bogo' ),
37		- 'es_ES' => __( 'Spanish', 'bogo' ),
38		- 'es_CL' => __( 'Chilean Spanish', 'bogo' ),
39		- 'es_MX' => __( 'Mexican Spanish', 'bogo' ),
40		- 'es_PE' => __( 'Peruvian Spanish', 'bogo' ),
41		- 'es_VE' => __( 'Venezuelan Spanish', 'bogo' ),
	46	+ 'es_ES' => __( 'Spanish (Spain)', 'bogo' ),
	47	+ 'es_AR' => __( 'Spanish (Argentina)', 'bogo' ),
	48	+ 'es_CL' => __( 'Spanish (Chile)', 'bogo' ),
	49	+ 'es_CO' => __( 'Spanish (Colombia)', 'bogo' ),
	50	+ 'es_GT' => __( 'Spanish (Guatemala)', 'bogo' ),
	51	+ 'es_MX' => __( 'Spanish (Mexico)', 'bogo' ),
	52	+ 'es_PE' => __( 'Spanish (Peru)', 'bogo' ),
	53	+ 'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ),
42	54	'et' => __( 'Estonian', 'bogo' ),
43	55	'eu' => __( 'Basque', 'bogo' ),
44	56	'fa_IR' => __( 'Persian', 'bogo' ),
45	57	'fi' => __( 'Finnish', 'bogo' ),
46	58	'fo' => __( 'Faroese', 'bogo' ),
47		- 'fr_FR' => __( 'French', 'bogo' ),
	59	+ 'fr_FR' => __( 'French (France)', 'bogo' ),
	60	+ 'fr_BE' => __( 'French (Belgium)', 'bogo' ),
	61	+ 'fr_CA' => __( 'French (Canada)', 'bogo' ),
48	62	'fy' => __( 'Frisian', 'bogo' ),
49	63	'ga' => __( 'Irish', 'bogo' ),
50	64	'gd' => __( 'Scottish Gaelic', 'bogo' ),
51	65	'gl_ES' => __( 'Galician', 'bogo' ),
52	66	'gu' => __( 'Gujarati', 'bogo' ),
	67	+ 'haz' => __( 'Hazaragi', 'bogo' ),
53	68	'he_IL' => __( 'Hebrew', 'bogo' ),
54	69	'hi_IN' => __( 'Hindi', 'bogo' ),
55	70	'hr' => __( 'Croatian', 'bogo' ),
56	71	'ht' => __( 'Haitian', 'bogo' ),
		@@ -77,17 +92,21 @@
77	92	'mr' => __( 'Marathi', 'bogo' ),
78	93	'ms_MY' => __( 'Malay', 'bogo' ),
79	94	'mt_MT' => __( 'Maltese', 'bogo' ),
80	95	'my_MM' => __( 'Burmese', 'bogo' ),
81		- 'nb_NO' => __( 'Norwegian', 'bogo' ),
	96	+ 'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ),
82	97	'ne_NP' => __( 'Nepali', 'bogo' ),
83	98	'ni_ID' => __( 'Nias', 'bogo' ),
84	99	'nl_NL' => __( 'Dutch', 'bogo' ),
	100	+ 'nl_NL_formal' => __( 'Dutch (Formal)', 'bogo' ),
	101	+ 'nn_NO' => __( 'Norwegian (Nynorsk)', 'bogo' ),
	102	+ 'oci' => __( 'Occitan', 'bogo' ),
85	103	'os' => __( 'Ossetic', 'bogo' ),
86	104	'pa_IN' => __( 'Punjabi', 'bogo' ),
87	105	'pl_PL' => __( 'Polish', 'bogo' ),
88		- 'pt_BR' => __( 'Brazilian Portuguese', 'bogo' ),
89		- 'pt_PT' => __( 'Portuguese', 'bogo' ),
	106	+ 'ps' => __( 'Pashto', 'bogo' ),
	107	+ 'pt_BR' => __( 'Portuguese (Brazil)', 'bogo' ),
	108	+ 'pt_PT' => __( 'Portuguese (Portugal)', 'bogo' ),
90	109	'ro_RO' => __( 'Romanian', 'bogo' ),
91	110	'ru_RU' => __( 'Russian', 'bogo' ),
92	111	'sa_IN' => __( 'Sanskrit', 'bogo' ),
93	112	'si_LK' => __( 'Sinhala', 'bogo' ),
		@@ -98,8 +117,9 @@
98	117	'sr_RS' => __( 'Serbian', 'bogo' ),
99	118	'sv_SE' => __( 'Swedish', 'bogo' ),
100	119	'su_ID' => __( 'Sundanese', 'bogo' ),
101	120	'sw' => __( 'Swahili', 'bogo' ),
	121	+ 'szl' => __( 'Silesian', 'bogo' ),
102	122	'ta_IN' => __( 'Tamil', 'bogo' ),
103	123	'te' => __( 'Telugu', 'bogo' ),
104	124	'tg' => __( 'Tajik', 'bogo' ),
105	125	'th' => __( 'Thai', 'bogo' ),
		@@ -110,15 +130,20 @@
110	130	'uk' => __( 'Ukrainian', 'bogo' ),
111	131	'ur' => __( 'Urdu', 'bogo' ),
112	132	'uz_UZ' => __( 'Uzbek', 'bogo' ),
113	133	'vi' => __( 'Vietnamese', 'bogo' ),
114		- 'zh_CN' => __( 'Chinese', 'bogo' ),
115		- 'zh_TW' => __( 'Traditional Chinese', 'bogo' )
	134	+ 'zh_CN' => __( 'Chinese (China)', 'bogo' ),
	135	+ 'zh_HK' => __( 'Chinese (Hong Kong)', 'bogo' ),
	136	+ 'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' )
116	137	);
117	138
118		- $languages = apply_filters( 'bogo_languages', $languages );
	139	+ if ( is_textdomain_loaded( 'bogo' ) ) {
	140	+ $textdomain_loaded = true;
	141	+ }
119	142
120		- return $languages;
	143	+ asort( $languages, SORT_STRING );
	144	+
	145	+ return apply_filters( 'bogo_languages', $languages );
121	146	}
122	147
123	148	function bogo_get_language( $locale ) {
124	149	$languages = bogo_languages();
		@@ -128,22 +153,55 @@
128	153
129	154	return null;
130	155	}
131	156
	157	+function bogo_get_language_native_name( $locale ) {
	158	+ if ( 'en_US' == $locale ) {
	159	+ return 'English (United States)';
	160	+ }
	161	+
	162	+ if ( ! function_exists( 'wp_get_available_translations' ) ) {
	163	+ require_once ABSPATH . 'wp-admin/includes/translation-install.php';
	164	+ }
	165	+
	166	+ static $available_translations = array();
	167	+
	168	+ if ( empty( $available_translations ) ) {
	169	+ $available_translations = wp_get_available_translations();
	170	+ }
	171	+
	172	+ if ( isset( $available_translations[$locale]['native_name'] ) ) {
	173	+ return $available_translations[$locale]['native_name'];
	174	+ }
	175	+
	176	+ return false;
	177	+}
	178	+
132	179	function bogo_get_default_locale() {
133		- if ( defined( 'WPLANG' ) )
	180	+ if ( defined( 'WPLANG' ) ) {
134	181	$locale = WPLANG;
	182	+ }
135	183
136	184	if ( is_multisite() ) {
137		- if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) )
	185	+ if ( defined( 'WP_INSTALLING' )
	186	+ || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
138	187	$ms_locale = get_site_option( 'WPLANG' );
	188	+ }
139	189
140		- if ( $ms_locale !== false )
	190	+ if ( $ms_locale !== false ) {
141	191	$locale = $ms_locale;
	192	+ }
	193	+ } else {
	194	+ $db_locale = get_option( 'WPLANG' );
	195	+
	196	+ if ( $db_locale !== false ) {
	197	+ $locale = $db_locale;
	198	+ }
142	199	}
143	200
144		- if ( empty( $locale ) )
	201	+ if ( empty( $locale ) ) {
145	202	$locale = 'en_US';
	203	+ }
146	204
147	205	return $locale;
148	206	}
149	207
		@@ -155,8 +213,9 @@
155	213
156	214	function bogo_available_locales( $args = '' ) {
157	215	$defaults = array(
158	216	'exclude' => array(),
	217	+ 'exclude_enus_if_inactive' => false,
159	218	'current_user_can_access' => false );
160	219
161	220	$args = wp_parse_args( $args, $defaults );
162	221
		@@ -161,9 +220,16 @@
161	220	$args = wp_parse_args( $args, $defaults );
162	221
163	222	$installed_locales = get_available_languages();
164	223	$installed_locales[] = bogo_get_default_locale();
165		- $installed_locales[] = 'en_US';
	224	+
	225	+ $exclude_enus = $args['exclude_enus_if_inactive']
	226	+ && bogo_get_prop( 'enus_deactivated' );
	227	+
	228	+ if ( ! $exclude_enus ) {
	229	+ $installed_locales[] = 'en_US';
	230	+ }
	231	+
166	232	$installed_locales = array_unique( $installed_locales );
167	233	$installed_locales = array_filter( $installed_locales );
168	234
169	235	$available_locales = array();
		@@ -221,9 +287,19 @@
221	287	return $langs;
222	288	}
223	289
224	290	function bogo_is_available_locale( $locale ) {
225		- return ! empty( $locale ) && in_array( $locale, bogo_available_locales() );
	291	+ if ( empty( $locale ) ) {
	292	+ return false;
	293	+ }
	294	+
	295	+ static $available_locales = array();
	296	+
	297	+ if ( empty( $available_locales ) ) {
	298	+ $available_locales = bogo_available_locales();
	299	+ }
	300	+
	301	+ return in_array( $locale, $available_locales );
226	302	}
227	303
228	304	function bogo_filter_locales( $locales, $filter = 'available' ) {
229	305	return array_intersect( $locales, bogo_available_locales() );
		@@ -228,13 +304,19 @@
228	304	function bogo_filter_locales( $locales, $filter = 'available' ) {
229	305	return array_intersect( $locales, bogo_available_locales() );
230	306	}
231	307
	308	+/**
	309	+ * @see http://www.ietf.org/rfc/bcp/bcp47.txt
	310	+ */
232	311	function bogo_language_tag( $locale ) {
233		- // http://www.ietf.org/rfc/bcp/bcp47.txt
234	312	$tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale );
235	313	$tag = trim( $tag, '-' );
236	314
	315	+ if ( '-formal' == substr( $tag, -7 ) ) {
	316	+ $tag = substr( $tag, 0, -7 );
	317	+ }
	318	+
237	319	return apply_filters( 'bogo_language_tag', $tag, $locale );
238	320	}
239	321
240	322	function bogo_lang_slug( $locale ) {
		@@ -342,17 +424,19 @@
342	424	$url .= $_SERVER['HTTP_HOST'];
343	425	$url .= $_SERVER['REQUEST_URI'];
344	426	}
345	427
346		- if ( $frag = strstr( $url, '#' ) )
	428	+ if ( $frag = strstr( $url, '#' ) ) {
347	429	$url = substr( $url, 0, - strlen( $frag ) );
	430	+ }
348	431
349	432	if ( $query = @parse_url( $url, PHP_URL_QUERY ) ) {
350	433	parse_str( $query, $query_vars );
351	434
352	435	foreach ( array_keys( $query_vars ) as $qv ) {
353		- if ( ! get_query_var( $qv ) )
	436	+ if ( ! get_query_var( $qv ) ) {
354	437	$url = remove_query_arg( $qv, $url );
	438	+ }
355	439	}
356	440	}
357	441	}
358	442
		@@ -357,11 +441,18 @@
357	441	}
358	442
359	443	$default_locale = bogo_get_default_locale();
360	444
361		- if ( ! $lang )
	445	+ if ( ! $lang ) {
362	446	$lang = $default_locale;
	447	+ }
363	448
	449	+ $use_implicit_lang = apply_filters( 'bogo_use_implicit_lang', true );
	450	+
	451	+ $lang_slug = ( $use_implicit_lang && $lang == $default_locale )
	452	+ ? ''
	453	+ : bogo_lang_slug( $lang );
	454	+
364	455	$home = set_url_scheme( get_option( 'home' ) );
365	456	$home = trailingslashit( $home );
366	457
367	458	$url = remove_query_arg( 'lang', $url );
		@@ -366,10 +457,11 @@
366	457
367	458	$url = remove_query_arg( 'lang', $url );
368	459
369	460	if ( ! $args['using_permalinks'] ) {
370		- if ( $lang != $default_locale )
371		- $url = add_query_arg( array( 'lang' => bogo_lang_slug( $lang ) ), $url );
	461	+ if ( $lang_slug ) {
	462	+ $url = add_query_arg( array( 'lang' => $lang_slug ), $url );
	463	+ }
372	464
373	465	return $url;
374	466	}
375	467
		@@ -374,13 +466,19 @@
374	466	}
375	467
376	468	$available_languages = array_map( 'bogo_lang_slug', bogo_available_locales() );
377	469
	470	+ $tail_slashed = ( '/' == substr( $url, -1 ) );
	471	+
378	472	$url = preg_replace(
379	473	'#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#',
380		- $home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ),
	474	+ $home . ( $lang_slug ? trailingslashit( $lang_slug ) : '' ),
381	475	trailingslashit( $url ) );
382	476
	477	+ if ( ! $tail_slashed ) {
	478	+ $url = untrailingslashit( $url );
	479	+ }
	480	+
383	481	return $url;
384	482	}
385	483
386	484	function bogo_get_lang_from_url( $url = '' ) {
		@@ -416,10 +514,11 @@
416	514
417	515	function bogo_get_prop( $prop ) {
418	516	$option = get_option( 'bogo' );
419	517
420		- if ( ! is_array( $option ) )
	518	+ if ( ! is_array( $option ) ) {
421	519	$option = array();
	520	+ }
422	521
423	522	return isset( $option[$prop] ) ? $option[$prop] : '';
424	523	}
425	524
		@@ -425,10 +524,11 @@
425	524
426	525	function bogo_set_prop( $prop, $value ) {
427	526	$option = get_option( 'bogo' );
428	527
429		- if ( ! is_array( $option ) )
	528	+ if ( ! is_array( $option ) ) {
430	529	$option = array();
	530	+ }
431	531
432	532	$option[$prop] = $value;
433	533
434	534	update_option( 'bogo', $option );
		@@ -433,5 +533,27 @@
433	533
434	534	update_option( 'bogo', $option );
435	535	}
436	536
437		-?>
	537	+function bogo_delete_prop( $prop ) {
	538	+ $option = get_option( 'bogo' );
	539	+
	540	+ if ( ! is_array( $option ) ) {
	541	+ $option = array();
	542	+ }
	543	+
	544	+ if ( isset( $option[$prop] ) ) {
	545	+ unset( $option[$prop] );
	546	+ }
	547	+
	548	+ update_option( 'bogo', $option );
	549	+}
	550	+
	551	+function bogo_plugin_url( $path = '' ) {
	552	+ $url = plugins_url( $path, BOGO_PLUGIN );
	553	+
	554	+ if ( is_ssl() && 'http:' == substr( $url, 0, 5 ) ) {
	555	+ $url = 'https:' . substr( $url, 5 );
	556	+ }
	557	+
	558	+ return $url;
	559	+}