← All changes | includes/functions.php +25 -4 2.6 → 2.9 View file →

		@@ -15,8 +15,9 @@
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' ),
19	20	'be_BY' => __( 'Belarusian', 'bogo' ),
20	21	'bg_BG' => __( 'Bulgarian', 'bogo' ),
21	22	'bn_BD' => __( 'Bangla', 'bogo' ),
22	23	'bn_IN' => __( 'Indian Bengali', 'bogo' ),
		@@ -22,8 +23,9 @@
22	23	'bn_IN' => __( 'Indian Bengali', 'bogo' ),
23	24	'bo' => __( 'Tibetan', 'bogo' ),
24	25	'bs_BA' => __( 'Bosnian', 'bogo' ),
25	26	'ca' => __( 'Catalan', 'bogo' ),
	27	+ 'ceb' => __( 'Cebuano', 'bogo' ),
26	28	'ckb' => __( 'Central Kurdish', 'bogo' ),
27	29	'co' => __( 'Corsican', 'bogo' ),
28	30	'cs_CZ' => __( 'Czech', 'bogo' ),
29	31	'cy' => __( 'Welsh', 'bogo' ),
		@@ -30,8 +32,9 @@
30	32	'da_DK' => __( 'Danish', 'bogo' ),
31	33	'de_DE' => __( 'German', 'bogo' ),
32	34	'de_DE_formal' => __( 'German (Formal)', 'bogo' ),
33	35	'de_CH' => __( 'German (Switzerland)', 'bogo' ),
	36	+ 'de_CH_informal' => __( 'German (Switzerland) (Informal)', 'bogo' ),
34	37	'dv' => __( 'Dhivehi', 'bogo' ),
35	38	'el' => __( 'Greek', 'bogo' ),
36	39	'en_US' => __( 'English (United States)', 'bogo' ),
37	40	'en_AU' => __( 'English (Australia)', 'bogo' ),
		@@ -40,10 +43,12 @@
40	43	'en_NZ' => __( 'English (New Zealand)', 'bogo' ),
41	44	'en_ZA' => __( 'English (South Africa)', 'bogo' ),
42	45	'eo' => __( 'Esperanto', 'bogo' ),
43	46	'es_ES' => __( 'Spanish (Spain)', 'bogo' ),
	47	+ 'es_AR' => __( 'Spanish (Argentina)', 'bogo' ),
44	48	'es_CL' => __( 'Spanish (Chile)', 'bogo' ),
45	49	'es_CO' => __( 'Spanish (Colombia)', 'bogo' ),
	50	+ 'es_GT' => __( 'Spanish (Guatemala)', 'bogo' ),
46	51	'es_MX' => __( 'Spanish (Mexico)', 'bogo' ),
47	52	'es_PE' => __( 'Spanish (Peru)', 'bogo' ),
48	53	'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ),
49	54	'et' => __( 'Estonian', 'bogo' ),
		@@ -52,8 +57,9 @@
52	57	'fi' => __( 'Finnish', 'bogo' ),
53	58	'fo' => __( 'Faroese', 'bogo' ),
54	59	'fr_FR' => __( 'French (France)', 'bogo' ),
55	60	'fr_BE' => __( 'French (Belgium)', 'bogo' ),
	61	+ 'fr_CA' => __( 'French (Canada)', 'bogo' ),
56	62	'fy' => __( 'Frisian', 'bogo' ),
57	63	'ga' => __( 'Irish', 'bogo' ),
58	64	'gd' => __( 'Scottish Gaelic', 'bogo' ),
59	65	'gl_ES' => __( 'Galician', 'bogo' ),
		@@ -90,8 +96,9 @@
90	96	'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ),
91	97	'ne_NP' => __( 'Nepali', 'bogo' ),
92	98	'ni_ID' => __( 'Nias', 'bogo' ),
93	99	'nl_NL' => __( 'Dutch', 'bogo' ),
	100	+ 'nl_NL_formal' => __( 'Dutch (Formal)', 'bogo' ),
94	101	'nn_NO' => __( 'Norwegian (Nynorsk)', 'bogo' ),
95	102	'oci' => __( 'Occitan', 'bogo' ),
96	103	'os' => __( 'Ossetic', 'bogo' ),
97	104	'pa_IN' => __( 'Punjabi', 'bogo' ),
		@@ -110,8 +117,9 @@
110	117	'sr_RS' => __( 'Serbian', 'bogo' ),
111	118	'sv_SE' => __( 'Swedish', 'bogo' ),
112	119	'su_ID' => __( 'Sundanese', 'bogo' ),
113	120	'sw' => __( 'Swahili', 'bogo' ),
	121	+ 'szl' => __( 'Silesian', 'bogo' ),
114	122	'ta_IN' => __( 'Tamil', 'bogo' ),
115	123	'te' => __( 'Telugu', 'bogo' ),
116	124	'tg' => __( 'Tajik', 'bogo' ),
117	125	'th' => __( 'Thai', 'bogo' ),
		@@ -123,8 +131,9 @@
123	131	'ur' => __( 'Urdu', 'bogo' ),
124	132	'uz_UZ' => __( 'Uzbek', 'bogo' ),
125	133	'vi' => __( 'Vietnamese', 'bogo' ),
126	134	'zh_CN' => __( 'Chinese (China)', 'bogo' ),
	135	+ 'zh_HK' => __( 'Chinese (Hong Kong)', 'bogo' ),
127	136	'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' )
128	137	);
129	138
130	139	if ( is_textdomain_loaded( 'bogo' ) ) {
		@@ -295,13 +304,19 @@
295	304	function bogo_filter_locales( $locales, $filter = 'available' ) {
296	305	return array_intersect( $locales, bogo_available_locales() );
297	306	}
298	307
	308	+/**
	309	+ * @see http://www.ietf.org/rfc/bcp/bcp47.txt
	310	+ */
299	311	function bogo_language_tag( $locale ) {
300		- // http://www.ietf.org/rfc/bcp/bcp47.txt
301	312	$tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale );
302	313	$tag = trim( $tag, '-' );
303	314
	315	+ if ( '-formal' == substr( $tag, -7 ) ) {
	316	+ $tag = substr( $tag, 0, -7 );
	317	+ }
	318	+
304	319	return apply_filters( 'bogo_language_tag', $tag, $locale );
305	320	}
306	321
307	322	function bogo_lang_slug( $locale ) {
		@@ -430,8 +445,14 @@
430	445	if ( ! $lang ) {
431	446	$lang = $default_locale;
432	447	}
433	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	+
434	455	$home = set_url_scheme( get_option( 'home' ) );
435	456	$home = trailingslashit( $home );
436	457
437	458	$url = remove_query_arg( 'lang', $url );
		@@ -436,10 +457,10 @@
436	457
437	458	$url = remove_query_arg( 'lang', $url );
438	459
439	460	if ( ! $args['using_permalinks'] ) {
440		- if ( $lang != $default_locale ) {
441		- $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 );
442	463	}
443	464
444	465	return $url;
445	466	}
		@@ -449,9 +470,9 @@
449	470	$tail_slashed = ( '/' == substr( $url, -1 ) );
450	471
451	472	$url = preg_replace(
452	473	'#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#',
453		- $home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ),
	474	+ $home . ( $lang_slug ? trailingslashit( $lang_slug ) : '' ),
454	475	trailingslashit( $url ) );
455	476
456	477	if ( ! $tail_slashed ) {
457	478	$url = untrailingslashit( $url );