← All changes | includes/functions.php +228 -56 2.1 → 2.6 View file →

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