← All changes | includes/functions.php +161 -48 2.0 → 2.4 View file →

		@@ -1,96 +1,162 @@
1	1	<?php
2	2
3		-function bogo_languages( $locale = '' ) {
	3	+function bogo_languages() {
	4	+ static $languages = array();
	5	+
	6	+ if ( ! empty( $languages ) ) {
	7	+ return $languages;
	8	+ }
	9	+
4	10	$languages = array(
5	11	'af' => __( 'Afrikaans', 'bogo' ),
	12	+ 'am' => __( 'Amharic', 'bogo' ),
	13	+ 'an' => __( 'Aragonese', 'bogo' ),
6	14	'ar' => __( 'Arabic', 'bogo' ),
	15	+ 'as' => __( 'Assamese', 'bogo' ),
	16	+ 'az' => __( 'Azerbaijani', 'bogo' ),
7	17	'be_BY' => __( 'Belarusian', 'bogo' ),
8	18	'bg_BG' => __( 'Bulgarian', 'bogo' ),
9	19	'bn_BD' => __( 'Bangla', 'bogo' ),
	20	+ 'bn_IN' => __( 'Indian Bengali', 'bogo' ),
	21	+ 'bo' => __( 'Tibetan', 'bogo' ),
	22	+ 'bs_BA' => __( 'Bosnian', 'bogo' ),
10	23	'ca' => __( 'Catalan', 'bogo' ),
	24	+ 'ckb' => __( 'Central Kurdish', 'bogo' ),
	25	+ 'co' => __( 'Corsican', 'bogo' ),
11	26	'cs_CZ' => __( 'Czech', 'bogo' ),
12	27	'cy' => __( 'Welsh', 'bogo' ),
13	28	'da_DK' => __( 'Danish', 'bogo' ),
14	29	'de_DE' => __( 'German', 'bogo' ),
	30	+ 'dv' => __( 'Dhivehi', 'bogo' ),
15	31	'el' => __( 'Greek', 'bogo' ),
16		- 'en_GB' => __( 'British English', 'bogo' ),
17		- 'en_US' => __( 'English', 'bogo' ),
	32	+ 'en_US' => __( 'English (United States)', 'bogo' ),
	33	+ 'en_AU' => __( 'English (Australia)', 'bogo' ),
	34	+ 'en_CA' => __( 'English (Canada)', 'bogo' ),
	35	+ 'en_GB' => __( 'English (UK)', 'bogo' ),
18	36	'eo' => __( 'Esperanto', 'bogo' ),
19		- 'es_ES' => __( 'Spanish', 'bogo' ),
	37	+ 'es_ES' => __( 'Spanish (Spain)', 'bogo' ),
	38	+ 'es_CL' => __( 'Spanish (Chile)', 'bogo' ),
	39	+ 'es_MX' => __( 'Mexican Spanish', 'bogo' ),
	40	+ 'es_PE' => __( 'Spanish (Peru)', 'bogo' ),
	41	+ 'es_VE' => __( 'Spanish (Venezuela)', 'bogo' ),
20	42	'et' => __( 'Estonian', 'bogo' ),
21	43	'eu' => __( 'Basque', 'bogo' ),
22	44	'fa_IR' => __( 'Persian', 'bogo' ),
23		- 'fi_FI' => __( 'Finnish', 'bogo' ),
	45	+ 'fi' => __( 'Finnish', 'bogo' ),
24	46	'fo' => __( 'Faroese', 'bogo' ),
25		- 'fr_FR' => __( 'French', 'bogo' ),
26		- 'ge_GE' => __( 'Georgian', 'bogo' ),
	47	+ 'fr_FR' => __( 'French (France)', 'bogo' ),
	48	+ 'fy' => __( 'Frisian', 'bogo' ),
	49	+ 'ga' => __( 'Irish', 'bogo' ),
	50	+ 'gd' => __( 'Scottish Gaelic', 'bogo' ),
27	51	'gl_ES' => __( 'Galician', 'bogo' ),
	52	+ 'gu' => __( 'Gujarati', 'bogo' ),
28	53	'he_IL' => __( 'Hebrew', 'bogo' ),
	54	+ 'hi_IN' => __( 'Hindi', 'bogo' ),
29	55	'hr' => __( 'Croatian', 'bogo' ),
	56	+ 'ht' => __( 'Haitian', 'bogo' ),
30	57	'hu_HU' => __( 'Hungarian', 'bogo' ),
	58	+ 'hy' => __( 'Armenian', 'bogo' ),
31	59	'id_ID' => __( 'Indonesian', 'bogo' ),
32	60	'is_IS' => __( 'Icelandic', 'bogo' ),
33	61	'it_IT' => __( 'Italian', 'bogo' ),
34	62	'ja' => __( 'Japanese', 'bogo' ),
	63	+ 'jv_ID' => __( 'Javanese', 'bogo' ),
	64	+ 'ka_GE' => __( 'Georgian', 'bogo' ),
	65	+ 'kk' => __( 'Kazakh', 'bogo' ),
35	66	'km_KH' => __( 'Khmer', 'bogo' ),
	67	+ 'kn' => __( 'Kannada', 'bogo' ),
36	68	'ko_KR' => __( 'Korean', 'bogo' ),
	69	+ 'li' => __( 'Limburgish', 'bogo' ),
	70	+ 'lo' => __( 'Lao', 'bogo' ),
37	71	'lt_LT' => __( 'Lithuanian', 'bogo' ),
38	72	'lv' => __( 'Latvian', 'bogo' ),
39	73	'mg_MG' => __( 'Malagasy', 'bogo' ),
40	74	'mk_MK' => __( 'Macedonian', 'bogo' ),
41		- 'mn_MN' => __( 'Mongolian', 'bogo' ),
	75	+ 'ml_IN' => __( 'Malayalam', 'bogo' ),
	76	+ 'mn' => __( 'Mongolian', 'bogo' ),
	77	+ 'mr' => __( 'Marathi', 'bogo' ),
42	78	'ms_MY' => __( 'Malay', 'bogo' ),
43		- 'nb_NO' => __( 'Norwegian', 'bogo' ),
	79	+ 'mt_MT' => __( 'Maltese', 'bogo' ),
	80	+ 'my_MM' => __( 'Burmese', 'bogo' ),
	81	+ 'nb_NO' => __( 'Norwegian (Bokmål)', 'bogo' ),
	82	+ 'ne_NP' => __( 'Nepali', 'bogo' ),
44	83	'ni_ID' => __( 'Nias', 'bogo' ),
45	84	'nl_NL' => __( 'Dutch', 'bogo' ),
	85	+ 'os' => __( 'Ossetic', 'bogo' ),
	86	+ 'pa_IN' => __( 'Punjabi', 'bogo' ),
46	87	'pl_PL' => __( 'Polish', 'bogo' ),
47		- 'pt_BR' => __( 'Brazilian Portuguese', 'bogo' ),
48		- 'pt_PT' => __( 'Portuguese', 'bogo' ),
49		- 'ro' => __( 'Romanian', 'bogo' ),
	88	+ 'pt_BR' => __( 'Portuguese (Brazil)', 'bogo' ),
	89	+ 'pt_PT' => __( 'Portuguese (Portugal)', 'bogo' ),
	90	+ 'ro_RO' => __( 'Romanian', 'bogo' ),
50	91	'ru_RU' => __( 'Russian', 'bogo' ),
	92	+ 'sa_IN' => __( 'Sanskrit', 'bogo' ),
51	93	'si_LK' => __( 'Sinhala', 'bogo' ),
52		- 'sk' => __( 'Slovak', 'bogo' ),
	94	+ 'sk_SK' => __( 'Slovak', 'bogo' ),
53	95	'sl_SI' => __( 'Slovenian', 'bogo' ),
	96	+ 'so_SO' => __( 'Somali', 'bogo' ),
54	97	'sq' => __( 'Albanian', 'bogo' ),
55		- 'sr_CS' => __( 'Serbian', 'bogo' ),
	98	+ 'sr_RS' => __( 'Serbian', 'bogo' ),
56	99	'sv_SE' => __( 'Swedish', 'bogo' ),
57	100	'su_ID' => __( 'Sundanese', 'bogo' ),
	101	+ 'sw' => __( 'Swahili', 'bogo' ),
	102	+ 'ta_IN' => __( 'Tamil', 'bogo' ),
	103	+ 'te' => __( 'Telugu', 'bogo' ),
58	104	'tg' => __( 'Tajik', 'bogo' ),
59	105	'th' => __( 'Thai', 'bogo' ),
60		- 'tr' => __( 'Turkish', 'bogo' ),
61		- 'uk_UA' => __( 'Ukrainian', 'bogo' ),
	106	+ 'tl' => __( 'Tagalog', 'bogo' ),
	107	+ 'tr_TR' => __( 'Turkish', 'bogo' ),
	108	+ 'tt_RU' => __( 'Tatar', 'bogo' ),
	109	+ 'ug_CN' => __( 'Uighur', 'bogo' ),
	110	+ 'uk' => __( 'Ukrainian', 'bogo' ),
	111	+ 'ur' => __( 'Urdu', 'bogo' ),
62	112	'uz_UZ' => __( 'Uzbek', 'bogo' ),
63	113	'vi' => __( 'Vietnamese', 'bogo' ),
64		- 'zh_CN' => __( 'Chinese', 'bogo' ),
65		- 'zh_TW' => __( 'Traditional Chinese', 'bogo' )
	114	+ 'zh_CN' => __( 'Chinese (China)', 'bogo' ),
	115	+ 'zh_TW' => __( 'Chinese (Taiwan)', 'bogo' )
66	116	);
67	117
	118	+ asort( $languages, SORT_STRING );
	119	+
68	120	$languages = apply_filters( 'bogo_languages', $languages );
69	121
70		- if ( empty( $locale ) )
71		- return $languages;
	122	+ return $languages;
	123	+}
72	124
73		- if ( ! empty( $languages[$locale] ) )
	125	+function bogo_get_language( $locale ) {
	126	+ $languages = bogo_languages();
	127	+
	128	+ if ( isset( $languages[$locale] ) )
74	129	return $languages[$locale];
75	130
76		- return null;
	131	+ return null;
77	132	}
78	133
79	134	function bogo_get_default_locale() {
80		- if ( defined( 'WPLANG' ) )
	135	+ if ( defined( 'WPLANG' ) ) {
81	136	$locale = WPLANG;
	137	+ }
82	138
83	139	if ( is_multisite() ) {
84		- if ( defined( 'WP_INSTALLING' ) || ( false === $ms_locale = get_option( 'WPLANG' ) ) )
	140	+ if ( defined( 'WP_INSTALLING' )
	141	+ || ( false === $ms_locale = get_option( 'WPLANG' ) ) ) {
85	142	$ms_locale = get_site_option( 'WPLANG' );
	143	+ }
86	144
87		- if ( $ms_locale !== false )
	145	+ if ( $ms_locale !== false ) {
88	146	$locale = $ms_locale;
	147	+ }
	148	+ } else {
	149	+ $db_locale = get_option( 'WPLANG' );
	150	+
	151	+ if ( $db_locale !== false ) {
	152	+ $locale = $db_locale;
	153	+ }
89	154	}
90	155
91		- if ( empty( $locale ) )
	156	+ if ( empty( $locale ) ) {
92	157	$locale = 'en_US';
	158	+ }
93	159
94	160	return $locale;
95	161	}
96	162
		@@ -99,18 +165,15 @@
99	165
100	166	return ! empty( $locale ) && $locale == bogo_get_default_locale();
101	167	}
102	168
103		-function bogo_available_languages( $args = '' ) {
	169	+function bogo_available_locales( $args = '' ) {
104	170	$defaults = array(
105	171	'exclude' => array(),
106		- 'orderby' => 'key',
107		- 'order' => 'ASC' );
	172	+ 'current_user_can_access' => false );
108	173
109	174	$args = wp_parse_args( $args, $defaults );
110	175
111		- $langs = array();
112		-
113	176	$installed_locales = get_available_languages();
114	177	$installed_locales[] = bogo_get_default_locale();
115	178	$installed_locales[] = 'en_US';
116	179	$installed_locales = array_unique( $installed_locales );
		@@ -115,30 +178,56 @@
115	178	$installed_locales[] = 'en_US';
116	179	$installed_locales = array_unique( $installed_locales );
117	180	$installed_locales = array_filter( $installed_locales );
118	181
	182	+ $available_locales = array();
	183	+
119	184	foreach ( $installed_locales as $locale ) {
120		- if ( in_array( $locale, (array) $args['exclude'] ) )
	185	+ if ( in_array( $locale, (array) $args['exclude'] ) ) {
121	186	continue;
	187	+ }
122	188
123		- $lang = bogo_languages( $locale );
	189	+ if ( $args['current_user_can_access']
	190	+ && ! current_user_can( 'bogo_access_locale', $locale ) ) {
	191	+ continue;
	192	+ }
124	193
125		- if ( empty( $lang ) )
126		- $lang = "[$locale]";
	194	+ $available_locales[] = $locale;
	195	+ }
127	196
128		- $langs[$locale] = $lang;
	197	+ return $available_locales;
	198	+}
	199	+
	200	+function bogo_available_languages( $args = '' ) {
	201	+ $defaults = array(
	202	+ 'exclude' => array(),
	203	+ 'orderby' => 'key',
	204	+ 'order' => 'ASC',
	205	+ 'current_user_can_access' => false );
	206	+
	207	+ $args = wp_parse_args( $args, $defaults );
	208	+
	209	+ $langs = array();
	210	+
	211	+ $available_locales = bogo_available_locales( $args );
	212	+
	213	+ foreach ( $available_locales as $locale ) {
	214	+ $lang = bogo_get_language( $locale );
	215	+ $langs[$locale] = empty( $lang ) ? "[$locale]" : $lang;
129	216	}
130	217
131	218	if ( 'value' == $args['orderby'] ) {
132	219	natcasesort( $langs );
133	220
134		- if ( 'DESC' == $args['order'] )
	221	+ if ( 'DESC' == $args['order'] ) {
135	222	$langs = array_reverse( $langs );
	223	+ }
136	224	} else {
137		- if ( 'DESC' == $args['order'] )
	225	+ if ( 'DESC' == $args['order'] ) {
138	226	krsort( $langs );
139		- else
	227	+ } else {
140	228	ksort( $langs );
	229	+ }
141	230	}
142	231
143	232	$langs = apply_filters( 'bogo_available_languages', $langs, $args );
144	233
		@@ -145,11 +234,25 @@
145	234	return $langs;
146	235	}
147	236
148	237	function bogo_is_available_locale( $locale ) {
149		- return ! empty( $locale ) && array_key_exists( $locale, (array) bogo_available_languages() );
	238	+ if ( empty( $locale ) ) {
	239	+ return false;
	240	+ }
	241	+
	242	+ static $available_locales = array();
	243	+
	244	+ if ( empty( $available_locales ) ) {
	245	+ $available_locales = bogo_available_locales();
	246	+ }
	247	+
	248	+ return in_array( $locale, $available_locales );
150	249	}
151	250
	251	+function bogo_filter_locales( $locales, $filter = 'available' ) {
	252	+ return array_intersect( $locales, bogo_available_locales() );
	253	+}
	254	+
152	255	function bogo_language_tag( $locale ) {
153	256	// http://www.ietf.org/rfc/bcp/bcp47.txt
154	257	$tag = preg_replace( '/[^0-9a-zA-Z]+/', '-', $locale );
155	258	$tag = trim( $tag, '-' );
		@@ -163,9 +266,9 @@
163	266
164	267	if ( false !== $pos = strpos( $tag, '-' ) )
165	268	$slug = substr( $tag, 0, $pos );
166	269
167		- $variations = preg_grep( '/^' . $slug . '/', array_keys( bogo_available_languages() ) );
	270	+ $variations = preg_grep( '/^' . $slug . '/', bogo_available_locales() );
168	271
169	272	if ( 1 < count( $variations ) )
170	273	$slug = $tag;
171	274
		@@ -171,8 +274,18 @@
171	274
172	275	return apply_filters( 'bogo_lang_slug', $slug, $locale );
173	276	}
174	277
	278	+function bogo_get_lang_regex() {
	279	+ $langs = array_map( 'bogo_lang_slug', bogo_available_locales() );
	280	+ $langs = array_filter( $langs );
	281	+
	282	+ if ( empty( $langs ) )
	283	+ return '';
	284	+
	285	+ return '(' . implode( '|', $langs ) . ')';
	286	+}
	287	+
175	288	function bogo_get_closest_locale( $var ) {
176	289	$var = strtolower( $var );
177	290
178	291	if ( ! preg_match( '/^([a-z]{2})(?:[_-]([a-z]{2}))?/', $var, $matches ) )
		@@ -180,9 +293,9 @@
180	293
181	294	$language_code = $matches[1];
182	295	$region_code = isset( $matches[2] ) ? $matches[2] : '';
183	296
184		- $locales = array_keys( bogo_available_languages() );
	297	+ $locales = bogo_available_locales();
185	298
186	299	if ( $region_code ) {
187	300	$locale = $language_code . '_' . strtoupper( $region_code );
188	301
		@@ -270,9 +383,10 @@
270	383
271	384	if ( ! $lang )
272	385	$lang = $default_locale;
273	386
274		- $home = trailingslashit( home_url() );
	387	+ $home = set_url_scheme( get_option( 'home' ) );
	388	+ $home = trailingslashit( $home );
275	389
276	390	$url = remove_query_arg( 'lang', $url );
277	391
278	392	if ( ! $args['using_permalinks'] ) {
		@@ -281,10 +395,9 @@
281	395
282	396	return $url;
283	397	}
284	398
285		- $available_languages = array_keys( bogo_available_languages() );
286		- $available_languages = array_map( 'bogo_lang_slug', $available_languages );
	399	+ $available_languages = array_map( 'bogo_lang_slug', bogo_available_locales() );
287	400
288	401	$url = preg_replace(
289	402	'#^' . preg_quote( $home ) . '((' . implode( '|', $available_languages ) . ')/)?#',
290	403	$home . ( $lang == $default_locale ? '' : bogo_lang_slug( $lang ) . '/' ),
		@@ -302,12 +415,12 @@
302	415
303	416	if ( $frag = strstr( $url, '#' ) )
304	417	$url = substr( $url, 0, - strlen( $frag ) );
305	418
306		- $home = trailingslashit( home_url() );
	419	+ $home = set_url_scheme( get_option( 'home' ) );
	420	+ $home = trailingslashit( $home );
307	421
308		- $available_languages = array_keys( bogo_available_languages() );
309		- $available_languages = array_map( 'bogo_lang_slug', $available_languages );
	422	+ $available_languages = array_map( 'bogo_lang_slug', bogo_available_locales() );
310	423
311	424	$regex = '#^' . preg_quote( $home ) . '(' . implode( '|', $available_languages ) . ')/#';
312	425
313	426	if ( preg_match( $regex, trailingslashit( $url ), $matches ) )