← All changes | includes/functions.php +56 -7 2.5 → 2.9 View file →

		@@ -12,10 +12,12 @@
12	12	'af' => __( 'Afrikaans', 'bogo' ),
13	13	'am' => __( 'Amharic', 'bogo' ),
14	14	'an' => __( 'Aragonese', 'bogo' ),
15	15	'ar' => __( 'Arabic', 'bogo' ),
	16	+ 'ary' => __( 'Moroccan Arabic', 'bogo' ),
16	17	'as' => __( 'Assamese', 'bogo' ),
17	18	'az' => __( 'Azerbaijani', 'bogo' ),
	19	+ 'azb' => __( 'South Azerbaijani', 'bogo' ),
18	20	'be_BY' => __( 'Belarusian', 'bogo' ),
19	21	'bg_BG' => __( 'Bulgarian', 'bogo' ),
20	22	'bn_BD' => __( 'Bangla', 'bogo' ),
21	23	'bn_IN' => __( 'Indian Bengali', 'bogo' ),
		@@ -21,8 +23,9 @@
21	23	'bn_IN' => __( 'Indian Bengali', 'bogo' ),
22	24	'bo' => __( 'Tibetan', 'bogo' ),
23	25	'bs_BA' => __( 'Bosnian', 'bogo' ),
24	26	'ca' => __( 'Catalan', 'bogo' ),
	27	+ 'ceb' => __( 'Cebuano', 'bogo' ),
25	28	'ckb' => __( 'Central Kurdish', 'bogo' ),
26	29	'co' => __( 'Corsican', 'bogo' ),
27	30	'cs_CZ' => __( 'Czech', 'bogo' ),
28	31	'cy' => __( 'Welsh', 'bogo' ),
		@@ -29,8 +32,9 @@
29	32	'da_DK' => __( 'Danish', 'bogo' ),
30	33	'de_DE' => __( 'German', 'bogo' ),
31	34	'de_DE_formal' => __( 'German (Formal)', 'bogo' ),
32	35	'de_CH' => __( 'German (Switzerland)', 'bogo' ),
	36	+ 'de_CH_informal' => __( 'German (Switzerland) (Informal)', 'bogo' ),
33	37	'dv' => __( 'Dhivehi', 'bogo' ),
34	38	'el' => __( 'Greek', 'bogo' ),
35	39	'en_US' => __( 'English (United States)', 'bogo' ),
36	40	'en_AU' => __( 'English (Australia)', 'bogo' ),
		@@ -35,12 +39,16 @@
35	39	'en_US' => __( 'English (United States)', 'bogo' ),
36	40	'en_AU' => __( 'English (Australia)', 'bogo' ),
37	41	'en_CA' => __( 'English (Canada)', 'bogo' ),
38	42	'en_GB' => __( 'English (UK)', 'bogo' ),
	43	+ 'en_NZ' => __( 'English (New Zealand)', 'bogo' ),
	44	+ 'en_ZA' => __( 'English (South Africa)', 'bogo' ),
39	45	'eo' => __( 'Esperanto', 'bogo' ),
40	46	'es_ES' => __( 'Spanish (Spain)', 'bogo' ),
	47	+ 'es_AR' => __( 'Spanish (Argentina)', 'bogo' ),
41	48	'es_CL' => __( 'Spanish (Chile)', 'bogo' ),
42	49	'es_CO' => __( 'Spanish (Colombia)', 'bogo' ),
	50	+ 'es_GT' => __( 'Spanish (Guatemala)', 'bogo' ),
43	51	'es_MX' => __( 'Spanish (Mexico)', 'bogo' ),
44	52	'es_PE' => __( 'Spanish (Peru)', 'bogo' ),
45	53	'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ),
46	54	'et' => __( 'Estonian', 'bogo' ),
		@@ -48,8 +56,10 @@
48	56	'fa_IR' => __( 'Persian', 'bogo' ),
49	57	'fi' => __( 'Finnish', 'bogo' ),
50	58	'fo' => __( 'Faroese', 'bogo' ),
51	59	'fr_FR' => __( 'French (France)', 'bogo' ),
	60	+ 'fr_BE' => __( 'French (Belgium)', 'bogo' ),
	61	+ 'fr_CA' => __( 'French (Canada)', 'bogo' ),
52	62	'fy' => __( 'Frisian', 'bogo' ),
53	63	'ga' => __( 'Irish', 'bogo' ),
54	64	'gd' => __( 'Scottish Gaelic', 'bogo' ),
55	65	'gl_ES' => __( 'Galician', 'bogo' ),
		@@ -86,8 +96,9 @@
86	96	'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ),
87	97	'ne_NP' => __( 'Nepali', 'bogo' ),
88	98	'ni_ID' => __( 'Nias', 'bogo' ),
89	99	'nl_NL' => __( 'Dutch', 'bogo' ),
	100	+ 'nl_NL_formal' => __( 'Dutch (Formal)', 'bogo' ),
90	101	'nn_NO' => __( 'Norwegian (Nynorsk)', 'bogo' ),
91	102	'oci' => __( 'Occitan', 'bogo' ),
92	103	'os' => __( 'Ossetic', 'bogo' ),
93	104	'pa_IN' => __( 'Punjabi', 'bogo' ),
		@@ -106,8 +117,9 @@
106	117	'sr_RS' => __( 'Serbian', 'bogo' ),
107	118	'sv_SE' => __( 'Swedish', 'bogo' ),
108	119	'su_ID' => __( 'Sundanese', 'bogo' ),
109	120	'sw' => __( 'Swahili', 'bogo' ),
	121	+ 'szl' => __( 'Silesian', 'bogo' ),
110	122	'ta_IN' => __( 'Tamil', 'bogo' ),
111	123	'te' => __( 'Telugu', 'bogo' ),
112	124	'tg' => __( 'Tajik', 'bogo' ),
113	125	'th' => __( 'Thai', 'bogo' ),
		@@ -119,8 +131,9 @@
119	131	'ur' => __( 'Urdu', 'bogo' ),
120	132	'uz_UZ' => __( 'Uzbek', 'bogo' ),
121	133	'vi' => __( 'Vietnamese', 'bogo' ),
122	134	'zh_CN' => __( 'Chinese (China)', 'bogo' ),
	135	+ 'zh_HK' => __( 'Chinese (Hong Kong)', 'bogo' ),
123	136	'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' )
124	137	);
125	138
126	139	if ( is_textdomain_loaded( 'bogo' ) ) {
		@@ -200,8 +213,9 @@
200	213
201	214	function bogo_available_locales( $args = '' ) {
202	215	$defaults = array(
203	216	'exclude' => array(),
	217	+ 'exclude_enus_if_inactive' => false,
204	218	'current_user_can_access' => false );
205	219
206	220	$args = wp_parse_args( $args, $defaults );
207	221
		@@ -206,9 +220,16 @@
206	220	$args = wp_parse_args( $args, $defaults );
207	221
208	222	$installed_locales = get_available_languages();
209	223	$installed_locales[] = bogo_get_default_locale();
210		- $installed_locales[] = 'en_US';
	224	+
	225	+ $exclude_enus = $args['exclude_enus_if_inactive']
	226	+ && bogo_get_prop( 'enus_deactivated' );
	227	+
	228	+ if ( ! $exclude_enus ) {
	229	+ $installed_locales[] = 'en_US';
	230	+ }
	231	+
211	232	$installed_locales = array_unique( $installed_locales );
212	233	$installed_locales = array_filter( $installed_locales );
213	234
214	235	$available_locales = array();
		@@ -283,13 +304,19 @@
283	304	function bogo_filter_locales( $locales, $filter = 'available' ) {
284	305	return array_intersect( $locales, bogo_available_locales() );
285	306	}
286	307
	308	+/**
	309	+ * @see http://www.ietf.org/rfc/bcp/bcp47.txt
	310	+ */
287	311	function bogo_language_tag( $locale ) {
288		- // http://www.ietf.org/rfc/bcp/bcp47.txt
289	312	$tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale );
290	313	$tag = trim( $tag, '-' );
291	314
	315	+ if ( '-formal' == substr( $tag, -7 ) ) {
	316	+ $tag = substr( $tag, 0, -7 );
	317	+ }
	318	+
292	319	return apply_filters( 'bogo_language_tag', $tag, $locale );
293	320	}
294	321
295	322	function bogo_lang_slug( $locale ) {
		@@ -418,8 +445,14 @@
418	445	if ( ! $lang ) {
419	446	$lang = $default_locale;
420	447	}
421	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	+
422	455	$home = set_url_scheme( get_option( 'home' ) );
423	456	$home = trailingslashit( $home );
424	457
425	458	$url = remove_query_arg( 'lang', $url );
		@@ -424,10 +457,10 @@
424	457
425	458	$url = remove_query_arg( 'lang', $url );
426	459
427	460	if ( ! $args['using_permalinks'] ) {
428		- if ( $lang != $default_locale ) {
429		- $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 );
430	463	}
431	464
432	465	return $url;
433	466	}
		@@ -437,9 +470,9 @@
437	470	$tail_slashed = ( '/' == substr( $url, -1 ) );
438	471
439	472	$url = preg_replace(
440	473	'#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#',
441		- $home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ),
	474	+ $home . ( $lang_slug ? trailingslashit( $lang_slug ) : '' ),
442	475	trailingslashit( $url ) );
443	476
444	477	if ( ! $tail_slashed ) {
445	478	$url = untrailingslashit( $url );
		@@ -481,10 +514,11 @@
481	514
482	515	function bogo_get_prop( $prop ) {
483	516	$option = get_option( 'bogo' );
484	517
485		- if ( ! is_array( $option ) )
	518	+ if ( ! is_array( $option ) ) {
486	519	$option = array();
	520	+ }
487	521
488	522	return isset( $option[$prop] ) ? $option[$prop] : '';
489	523	}
490	524
		@@ -490,12 +524,27 @@
490	524
491	525	function bogo_set_prop( $prop, $value ) {
492	526	$option = get_option( 'bogo' );
493	527
494		- if ( ! is_array( $option ) )
	528	+ if ( ! is_array( $option ) ) {
495	529	$option = array();
	530	+ }
496	531
497	532	$option[$prop] = $value;
	533	+
	534	+ update_option( 'bogo', $option );
	535	+}
	536	+
	537	+function bogo_delete_prop( $prop ) {
	538	+ $option = get_option( 'bogo' );
	539	+
	540	+ if ( ! is_array( $option ) ) {
	541	+ $option = array();
	542	+ }
	543	+
	544	+ if ( isset( $option[$prop] ) ) {
	545	+ unset( $option[$prop] );
	546	+ }
498	547
499	548	update_option( 'bogo', $option );
500	549	}
501	550