← All changes | includes/functions.php +4 -25 2.9 → 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' ),
		@@ -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' ) ) {
		@@ -304,19 +295,13 @@
304	295	function bogo_filter_locales( $locales, $filter = 'available' ) {
305	296	return array_intersect( $locales, bogo_available_locales() );
306	297	}
307	298
308		-/**
309		- * @see http://www.ietf.org/rfc/bcp/bcp47.txt
310		- */
311	299	function bogo_language_tag( $locale ) {
	300	+ // http://www.ietf.org/rfc/bcp/bcp47.txt
312	301	$tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale );
313	302	$tag = trim( $tag, '-' );
314	303
315		- if ( '-formal' == substr( $tag, -7 ) ) {
316		- $tag = substr( $tag, 0, -7 );
317		- }
318		-
319	304	return apply_filters( 'bogo_language_tag', $tag, $locale );
320	305	}
321	306
322	307	function bogo_lang_slug( $locale ) {
		@@ -445,14 +430,8 @@
445	430	if ( ! $lang ) {
446	431	$lang = $default_locale;
447	432	}
448	433
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		-
455	434	$home = set_url_scheme( get_option( 'home' ) );
456	435	$home = trailingslashit( $home );
457	436
458	437	$url = remove_query_arg( 'lang', $url );
		@@ -457,10 +436,10 @@
457	436
458	437	$url = remove_query_arg( 'lang', $url );
459	438
460	439	if ( ! $args['using_permalinks'] ) {
461		- if ( $lang_slug ) {
462		- $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 );
463	442	}
464	443
465	444	return $url;
466	445	}
		@@ -470,9 +449,9 @@
470	449	$tail_slashed = ( '/' == substr( $url, -1 ) );
471	450
472	451	$url = preg_replace(
473	452	'#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#',
474		- $home . ( $lang_slug ? trailingslashit( $lang_slug ) : '' ),
	453	+ $home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ),
475	454	trailingslashit( $url ) );
476	455
477	456	if ( ! $tail_slashed ) {
478	457	$url = untrailingslashit( $url );