← All changes | includes/functions.php +28 -65 3.0 → 2.6 View file →

		@@ -15,9 +15,8 @@
15	15	'ar' => __( 'Arabic', 'bogo' ),
16	16	'ary' => __( 'Moroccan Arabic', 'bogo' ),
17	17	'as' => __( 'Assamese', 'bogo' ),
18	18	'az' => __( 'Azerbaijani', 'bogo' ),
19		- 'azb' => __( 'South Azerbaijani', 'bogo' ),
20	19	'be_BY' => __( 'Belarusian', 'bogo' ),
21	20	'bg_BG' => __( 'Bulgarian', 'bogo' ),
22	21	'bn_BD' => __( 'Bangla', 'bogo' ),
23	22	'bn_IN' => __( 'Indian Bengali', 'bogo' ),
		@@ -23,9 +22,8 @@
23	22	'bn_IN' => __( 'Indian Bengali', 'bogo' ),
24	23	'bo' => __( 'Tibetan', 'bogo' ),
25	24	'bs_BA' => __( 'Bosnian', 'bogo' ),
26	25	'ca' => __( 'Catalan', 'bogo' ),
27		- 'ceb' => __( 'Cebuano', 'bogo' ),
28	26	'ckb' => __( 'Central Kurdish', 'bogo' ),
29	27	'co' => __( 'Corsican', 'bogo' ),
30	28	'cs_CZ' => __( 'Czech', 'bogo' ),
31	29	'cy' => __( 'Welsh', 'bogo' ),
		@@ -32,9 +30,8 @@
32	30	'da_DK' => __( 'Danish', 'bogo' ),
33	31	'de_DE' => __( 'German', 'bogo' ),
34	32	'de_DE_formal' => __( 'German (Formal)', 'bogo' ),
35	33	'de_CH' => __( 'German (Switzerland)', 'bogo' ),
36		- 'de_CH_informal' => __( 'German (Switzerland) (Informal)', 'bogo' ),
37	34	'dv' => __( 'Dhivehi', 'bogo' ),
38	35	'el' => __( 'Greek', 'bogo' ),
39	36	'en_US' => __( 'English (United States)', 'bogo' ),
40	37	'en_AU' => __( 'English (Australia)', 'bogo' ),
		@@ -43,12 +40,10 @@
43	40	'en_NZ' => __( 'English (New Zealand)', 'bogo' ),
44	41	'en_ZA' => __( 'English (South Africa)', 'bogo' ),
45	42	'eo' => __( 'Esperanto', 'bogo' ),
46	43	'es_ES' => __( 'Spanish (Spain)', 'bogo' ),
47		- 'es_AR' => __( 'Spanish (Argentina)', 'bogo' ),
48	44	'es_CL' => __( 'Spanish (Chile)', 'bogo' ),
49	45	'es_CO' => __( 'Spanish (Colombia)', 'bogo' ),
50		- 'es_GT' => __( 'Spanish (Guatemala)', 'bogo' ),
51	46	'es_MX' => __( 'Spanish (Mexico)', 'bogo' ),
52	47	'es_PE' => __( 'Spanish (Peru)', 'bogo' ),
53	48	'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ),
54	49	'et' => __( 'Estonian', 'bogo' ),
		@@ -57,9 +52,8 @@
57	52	'fi' => __( 'Finnish', 'bogo' ),
58	53	'fo' => __( 'Faroese', 'bogo' ),
59	54	'fr_FR' => __( 'French (France)', 'bogo' ),
60	55	'fr_BE' => __( 'French (Belgium)', 'bogo' ),
61		- 'fr_CA' => __( 'French (Canada)', 'bogo' ),
62	56	'fy' => __( 'Frisian', 'bogo' ),
63	57	'ga' => __( 'Irish', 'bogo' ),
64	58	'gd' => __( 'Scottish Gaelic', 'bogo' ),
65	59	'gl_ES' => __( 'Galician', 'bogo' ),
		@@ -77,9 +71,9 @@
77	71	'ja' => __( 'Japanese', 'bogo' ),
78	72	'jv_ID' => __( 'Javanese', 'bogo' ),
79	73	'ka_GE' => __( 'Georgian', 'bogo' ),
80	74	'kk' => __( 'Kazakh', 'bogo' ),
81		- 'km' => __( 'Khmer', 'bogo' ),
	75	+ 'km_KH' => __( 'Khmer', 'bogo' ),
82	76	'kn' => __( 'Kannada', 'bogo' ),
83	77	'ko_KR' => __( 'Korean', 'bogo' ),
84	78	'li' => __( 'Limburgish', 'bogo' ),
85	79	'lo' => __( 'Lao', 'bogo' ),
		@@ -96,9 +90,8 @@
96	90	'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ),
97	91	'ne_NP' => __( 'Nepali', 'bogo' ),
98	92	'ni_ID' => __( 'Nias', 'bogo' ),
99	93	'nl_NL' => __( 'Dutch', 'bogo' ),
100		- 'nl_NL_formal' => __( 'Dutch (Formal)', 'bogo' ),
101	94	'nn_NO' => __( 'Norwegian (Nynorsk)', 'bogo' ),
102	95	'oci' => __( 'Occitan', 'bogo' ),
103	96	'os' => __( 'Ossetic', 'bogo' ),
104	97	'pa_IN' => __( 'Punjabi', 'bogo' ),
		@@ -117,9 +110,8 @@
117	110	'sr_RS' => __( 'Serbian', 'bogo' ),
118	111	'sv_SE' => __( 'Swedish', 'bogo' ),
119	112	'su_ID' => __( 'Sundanese', 'bogo' ),
120	113	'sw' => __( 'Swahili', 'bogo' ),
121		- 'szl' => __( 'Silesian', 'bogo' ),
122	114	'ta_IN' => __( 'Tamil', 'bogo' ),
123	115	'te' => __( 'Telugu', 'bogo' ),
124	116	'tg' => __( 'Tajik', 'bogo' ),
125	117	'th' => __( 'Thai', 'bogo' ),
		@@ -131,9 +123,8 @@
131	123	'ur' => __( 'Urdu', 'bogo' ),
132	124	'uz_UZ' => __( 'Uzbek', 'bogo' ),
133	125	'vi' => __( 'Vietnamese', 'bogo' ),
134	126	'zh_CN' => __( 'Chinese (China)', 'bogo' ),
135		- 'zh_HK' => __( 'Chinese (Hong Kong)', 'bogo' ),
136	127	'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' )
137	128	);
138	129
139	130	if ( is_textdomain_loaded( 'bogo' ) ) {
		@@ -176,20 +167,14 @@
176	167	return false;
177	168	}
178	169
179	170	function bogo_get_default_locale() {
180		- static $locale = '';
181		-
182		- if ( ! empty( $locale ) ) {
183		- return $locale;
184		- }
185		-
186	171	if ( defined( 'WPLANG' ) ) {
187	172	$locale = WPLANG;
188	173	}
189	174
190	175	if ( is_multisite() ) {
191		- if ( wp_installing()
	176	+ if ( defined( 'WP_INSTALLING' )
192	177	|| ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
193	178	$ms_locale = get_site_option( 'WPLANG' );
194	179	}
195	180
		@@ -203,13 +188,13 @@
203	188	$locale = $db_locale;
204	189	}
205	190	}
206	191
207		- if ( ! empty( $locale ) ) {
208		- return $locale;
	192	+ if ( empty( $locale ) ) {
	193	+ $locale = 'en_US';
209	194	}
210	195
211		- return 'en_US';
	196	+ return $locale;
212	197	}
213	198
214	199	function bogo_is_default_locale( $locale ) {
215	200	$default_locale = bogo_get_default_locale();
		@@ -216,16 +201,8 @@
216	201
217	202	return ! empty( $locale ) && $locale == bogo_get_default_locale();
218	203	}
219	204
220		-function bogo_is_enus_deactivated() {
221		- if ( bogo_is_default_locale( 'en_US' ) ) {
222		- return false;
223		- }
224		-
225		- return (bool) bogo_get_prop( 'enus_deactivated' );
226		-}
227		-
228	205	function bogo_available_locales( $args = '' ) {
229	206	$defaults = array(
230	207	'exclude' => array(),
231	208	'exclude_enus_if_inactive' => false,
		@@ -232,39 +209,37 @@
232	209	'current_user_can_access' => false );
233	210
234	211	$args = wp_parse_args( $args, $defaults );
235	212
236		- static $installed_locales = array();
	213	+ $installed_locales = get_available_languages();
	214	+ $installed_locales[] = bogo_get_default_locale();
237	215
238		- if ( empty( $installed_locales ) ) {
239		- $installed_locales = get_available_languages();
240		- $installed_locales[] = bogo_get_default_locale();
	216	+ $exclude_enus = $args['exclude_enus_if_inactive']
	217	+ && bogo_get_prop( 'enus_deactivated' );
	218	+
	219	+ if ( ! $exclude_enus ) {
241	220	$installed_locales[] = 'en_US';
242	221	}
243	222
244		- $available_locales = $installed_locales;
	223	+ $installed_locales = array_unique( $installed_locales );
	224	+ $installed_locales = array_filter( $installed_locales );
245	225
246		- if ( $args['current_user_can_access']
247		- && ! current_user_can( 'bogo_access_all_locales' ) ) {
248		- $user_accessible_locales = bogo_get_user_accessible_locales(
249		- get_current_user_id() );
	226	+ $available_locales = array();
250	227
251		- $available_locales = array_intersect( $available_locales,
252		- (array) $user_accessible_locales );
253		- }
	228	+ foreach ( $installed_locales as $locale ) {
	229	+ if ( in_array( $locale, (array) $args['exclude'] ) ) {
	230	+ continue;
	231	+ }
254	232
255		- if ( ! empty( $args['exclude'] ) ) {
256		- $available_locales = array_diff( $available_locales,
257		- (array) $args['exclude'] );
258		- }
	233	+ if ( $args['current_user_can_access']
	234	+ && ! current_user_can( 'bogo_access_locale', $locale ) ) {
	235	+ continue;
	236	+ }
259	237
260		- if ( $args['exclude_enus_if_inactive']
261		- && bogo_is_enus_deactivated() ) {
262		- $available_locales = array_diff( $available_locales,
263		- array( 'en_US' ) );
	238	+ $available_locales[] = $locale;
264	239	}
265	240
266		- return array_unique( array_filter( $available_locales ) );
	241	+ return $available_locales;
267	242	}
268	243
269	244	function bogo_available_languages( $args = '' ) {
270	245	$defaults = array(
		@@ -320,19 +295,13 @@
320	295	function bogo_filter_locales( $locales, $filter = 'available' ) {
321	296	return array_intersect( $locales, bogo_available_locales() );
322	297	}
323	298
324		-/**
325		- * @see http://www.ietf.org/rfc/bcp/bcp47.txt
326		- */
327	299	function bogo_language_tag( $locale ) {
	300	+ // http://www.ietf.org/rfc/bcp/bcp47.txt
328	301	$tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale );
329	302	$tag = trim( $tag, '-' );
330	303
331		- if ( '-formal' == substr( $tag, -7 ) ) {
332		- $tag = substr( $tag, 0, -7 );
333		- }
334		-
335	304	return apply_filters( 'bogo_language_tag', $tag, $locale );
336	305	}
337	306
338	307	function bogo_lang_slug( $locale ) {
		@@ -461,14 +430,8 @@
461	430	if ( ! $lang ) {
462	431	$lang = $default_locale;
463	432	}
464	433
465		- $use_implicit_lang = apply_filters( 'bogo_use_implicit_lang', true );
466		-
467		- $lang_slug = ( $use_implicit_lang && $lang == $default_locale )
468		- ? ''
469		- : bogo_lang_slug( $lang );
470		-
471	434	$home = set_url_scheme( get_option( 'home' ) );
472	435	$home = trailingslashit( $home );
473	436
474	437	$url = remove_query_arg( 'lang', $url );
		@@ -473,10 +436,10 @@
473	436
474	437	$url = remove_query_arg( 'lang', $url );
475	438
476	439	if ( ! $args['using_permalinks'] ) {
477		- if ( $lang_slug ) {
478		- $url = add_query_arg( array( 'lang' => $lang_slug ), $url );
	440	+ if ( $lang != $default_locale ) {
	441	+ $url = add_query_arg( array( 'lang' => bogo_lang_slug( $lang ) ), $url );
479	442	}
480	443
481	444	return $url;
482	445	}
		@@ -486,9 +449,9 @@
486	449	$tail_slashed = ( '/' == substr( $url, -1 ) );
487	450
488	451	$url = preg_replace(
489	452	'#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#',
490		- $home . ( $lang_slug ? trailingslashit( $lang_slug ) : '' ),
	453	+ $home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ),
491	454	trailingslashit( $url ) );
492	455
493	456	if ( ! $tail_slashed ) {
494	457	$url = untrailingslashit( $url );