← All changes | includes/functions.php +134 -33 2.3 → 2.6 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,8 +12,9 @@
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' ),
17	19	'be_BY' => __( 'Belarusian', 'bogo' ),
18	20	'bg_BG' => __( 'Bulgarian', 'bogo' ),
		@@ -18,9 +20,9 @@
18	20	'bg_BG' => __( 'Bulgarian', 'bogo' ),
19	21	'bn_BD' => __( 'Bangla', 'bogo' ),
20	22	'bn_IN' => __( 'Indian Bengali', 'bogo' ),
21	23	'bo' => __( 'Tibetan', 'bogo' ),
22		- 'bs' => __( 'Bosnian', 'bogo' ),
	24	+ 'bs_BA' => __( 'Bosnian', 'bogo' ),
23	25	'ca' => __( 'Catalan', 'bogo' ),
24	26	'ckb' => __( 'Central Kurdish', 'bogo' ),
25	27	'co' => __( 'Corsican', 'bogo' ),
26	28	'cs_CZ' => __( 'Czech', 'bogo' ),
		@@ -26,31 +28,38 @@
26	28	'cs_CZ' => __( 'Czech', 'bogo' ),
27	29	'cy' => __( 'Welsh', 'bogo' ),
28	30	'da_DK' => __( 'Danish', 'bogo' ),
29	31	'de_DE' => __( 'German', 'bogo' ),
	32	+ 'de_DE_formal' => __( 'German (Formal)', 'bogo' ),
	33	+ 'de_CH' => __( 'German (Switzerland)', 'bogo' ),
30	34	'dv' => __( 'Dhivehi', 'bogo' ),
31	35	'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' ),
	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' ),
36	42	'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' ),
	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' ),
42	49	'et' => __( 'Estonian', 'bogo' ),
43	50	'eu' => __( 'Basque', 'bogo' ),
44	51	'fa_IR' => __( 'Persian', 'bogo' ),
45	52	'fi' => __( 'Finnish', 'bogo' ),
46	53	'fo' => __( 'Faroese', 'bogo' ),
47		- 'fr_FR' => __( 'French', 'bogo' ),
	54	+ 'fr_FR' => __( 'French (France)', 'bogo' ),
	55	+ 'fr_BE' => __( 'French (Belgium)', 'bogo' ),
48	56	'fy' => __( 'Frisian', 'bogo' ),
49	57	'ga' => __( 'Irish', 'bogo' ),
50	58	'gd' => __( 'Scottish Gaelic', 'bogo' ),
51	59	'gl_ES' => __( 'Galician', 'bogo' ),
52	60	'gu' => __( 'Gujarati', 'bogo' ),
	61	+ 'haz' => __( 'Hazaragi', 'bogo' ),
53	62	'he_IL' => __( 'Hebrew', 'bogo' ),
54	63	'hi_IN' => __( 'Hindi', 'bogo' ),
55	64	'hr' => __( 'Croatian', 'bogo' ),
56	65	'ht' => __( 'Haitian', 'bogo' ),
		@@ -77,17 +86,20 @@
77	86	'mr' => __( 'Marathi', 'bogo' ),
78	87	'ms_MY' => __( 'Malay', 'bogo' ),
79	88	'mt_MT' => __( 'Maltese', 'bogo' ),
80	89	'my_MM' => __( 'Burmese', 'bogo' ),
81		- 'nb_NO' => __( 'Norwegian', 'bogo' ),
	90	+ 'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ),
82	91	'ne_NP' => __( 'Nepali', 'bogo' ),
83	92	'ni_ID' => __( 'Nias', 'bogo' ),
84	93	'nl_NL' => __( 'Dutch', 'bogo' ),
	94	+ 'nn_NO' => __( 'Norwegian (Nynorsk)', 'bogo' ),
	95	+ 'oci' => __( 'Occitan', 'bogo' ),
85	96	'os' => __( 'Ossetic', 'bogo' ),
86	97	'pa_IN' => __( 'Punjabi', 'bogo' ),
87	98	'pl_PL' => __( 'Polish', 'bogo' ),
88		- 'pt_BR' => __( 'Brazilian Portuguese', 'bogo' ),
89		- 'pt_PT' => __( 'Portuguese', 'bogo' ),
	99	+ 'ps' => __( 'Pashto', 'bogo' ),
	100	+ 'pt_BR' => __( 'Portuguese (Brazil)', 'bogo' ),
	101	+ 'pt_PT' => __( 'Portuguese (Portugal)', 'bogo' ),
90	102	'ro_RO' => __( 'Romanian', 'bogo' ),
91	103	'ru_RU' => __( 'Russian', 'bogo' ),
92	104	'sa_IN' => __( 'Sanskrit', 'bogo' ),
93	105	'si_LK' => __( 'Sinhala', 'bogo' ),
		@@ -110,15 +122,19 @@
110	122	'uk' => __( 'Ukrainian', 'bogo' ),
111	123	'ur' => __( 'Urdu', 'bogo' ),
112	124	'uz_UZ' => __( 'Uzbek', 'bogo' ),
113	125	'vi' => __( 'Vietnamese', 'bogo' ),
114		- 'zh_CN' => __( 'Chinese', 'bogo' ),
115		- 'zh_TW' => __( 'Traditional Chinese', 'bogo' )
	126	+ 'zh_CN' => __( 'Chinese (China)', 'bogo' ),
	127	+ 'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' )
116	128	);
117	129
118		- $languages = apply_filters( 'bogo_languages', $languages );
	130	+ if ( is_textdomain_loaded( 'bogo' ) ) {
	131	+ $textdomain_loaded = true;
	132	+ }
119	133
120		- return $languages;
	134	+ asort( $languages, SORT_STRING );
	135	+
	136	+ return apply_filters( 'bogo_languages', $languages );
121	137	}
122	138
123	139	function bogo_get_language( $locale ) {
124	140	$languages = bogo_languages();
		@@ -128,22 +144,55 @@
128	144
129	145	return null;
130	146	}
131	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	+
132	170	function bogo_get_default_locale() {
133		- if ( defined( 'WPLANG' ) )
	171	+ if ( defined( 'WPLANG' ) ) {
134	172	$locale = WPLANG;
	173	+ }
135	174
136	175	if ( is_multisite() ) {
137		- if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) )
	176	+ if ( defined( 'WP_INSTALLING' )
	177	+ || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
138	178	$ms_locale = get_site_option( 'WPLANG' );
	179	+ }
139	180
140		- if ( $ms_locale !== false )
	181	+ if ( $ms_locale !== false ) {
141	182	$locale = $ms_locale;
	183	+ }
	184	+ } else {
	185	+ $db_locale = get_option( 'WPLANG' );
	186	+
	187	+ if ( $db_locale !== false ) {
	188	+ $locale = $db_locale;
	189	+ }
142	190	}
143	191
144		- if ( empty( $locale ) )
	192	+ if ( empty( $locale ) ) {
145	193	$locale = 'en_US';
	194	+ }
146	195
147	196	return $locale;
148	197	}
149	198
		@@ -155,8 +204,9 @@
155	204
156	205	function bogo_available_locales( $args = '' ) {
157	206	$defaults = array(
158	207	'exclude' => array(),
	208	+ 'exclude_enus_if_inactive' => false,
159	209	'current_user_can_access' => false );
160	210
161	211	$args = wp_parse_args( $args, $defaults );
162	212
		@@ -161,9 +211,16 @@
161	211	$args = wp_parse_args( $args, $defaults );
162	212
163	213	$installed_locales = get_available_languages();
164	214	$installed_locales[] = bogo_get_default_locale();
165		- $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	+
166	223	$installed_locales = array_unique( $installed_locales );
167	224	$installed_locales = array_filter( $installed_locales );
168	225
169	226	$available_locales = array();
		@@ -221,9 +278,19 @@
221	278	return $langs;
222	279	}
223	280
224	281	function bogo_is_available_locale( $locale ) {
225		- return ! empty( $locale ) && in_array( $locale, bogo_available_locales() );
	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 );
226	293	}
227	294
228	295	function bogo_filter_locales( $locales, $filter = 'available' ) {
229	296	return array_intersect( $locales, bogo_available_locales() );
		@@ -342,17 +409,19 @@
342	409	$url .= $_SERVER['HTTP_HOST'];
343	410	$url .= $_SERVER['REQUEST_URI'];
344	411	}
345	412
346		- if ( $frag = strstr( $url, '#' ) )
	413	+ if ( $frag = strstr( $url, '#' ) ) {
347	414	$url = substr( $url, 0, - strlen( $frag ) );
	415	+ }
348	416
349	417	if ( $query = @parse_url( $url, PHP_URL_QUERY ) ) {
350	418	parse_str( $query, $query_vars );
351	419
352	420	foreach ( array_keys( $query_vars ) as $qv ) {
353		- if ( ! get_query_var( $qv ) )
	421	+ if ( ! get_query_var( $qv ) ) {
354	422	$url = remove_query_arg( $qv, $url );
	423	+ }
355	424	}
356	425	}
357	426	}
358	427
		@@ -357,10 +426,11 @@
357	426	}
358	427
359	428	$default_locale = bogo_get_default_locale();
360	429
361		- if ( ! $lang )
	430	+ if ( ! $lang ) {
362	431	$lang = $default_locale;
	432	+ }
363	433
364	434	$home = set_url_scheme( get_option( 'home' ) );
365	435	$home = trailingslashit( $home );
366	436
		@@ -366,10 +436,11 @@
366	436
367	437	$url = remove_query_arg( 'lang', $url );
368	438
369	439	if ( ! $args['using_permalinks'] ) {
370		- if ( $lang != $default_locale )
	440	+ if ( $lang != $default_locale ) {
371	441	$url = add_query_arg( array( 'lang' => bogo_lang_slug( $lang ) ), $url );
	442	+ }
372	443
373	444	return $url;
374	445	}
375	446
		@@ -374,13 +445,19 @@
374	445	}
375	446
376	447	$available_languages = array_map( 'bogo_lang_slug', bogo_available_locales() );
377	448
	449	+ $tail_slashed = ( '/' == substr( $url, -1 ) );
	450	+
378	451	$url = preg_replace(
379	452	'#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#',
380	453	$home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ),
381	454	trailingslashit( $url ) );
382	455
	456	+ if ( ! $tail_slashed ) {
	457	+ $url = untrailingslashit( $url );
	458	+ }
	459	+
383	460	return $url;
384	461	}
385	462
386	463	function bogo_get_lang_from_url( $url = '' ) {
		@@ -416,10 +493,11 @@
416	493
417	494	function bogo_get_prop( $prop ) {
418	495	$option = get_option( 'bogo' );
419	496
420		- if ( ! is_array( $option ) )
	497	+ if ( ! is_array( $option ) ) {
421	498	$option = array();
	499	+ }
422	500
423	501	return isset( $option[$prop] ) ? $option[$prop] : '';
424	502	}
425	503
		@@ -425,10 +503,11 @@
425	503
426	504	function bogo_set_prop( $prop, $value ) {
427	505	$option = get_option( 'bogo' );
428	506
429		- if ( ! is_array( $option ) )
	507	+ if ( ! is_array( $option ) ) {
430	508	$option = array();
	509	+ }
431	510
432	511	$option[$prop] = $value;
433	512
434	513	update_option( 'bogo', $option );
		@@ -433,5 +512,27 @@
433	512
434	513	update_option( 'bogo', $option );
435	514	}
436	515
437		-?>
	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	+}