← All changes | include/switcher.php +15 -7 2.7.3 → 2.8 View file →

		@@ -1,5 +1,8 @@
1	1	<?php
	2	+/**
	3	+ * @package Polylang
	4	+ */
2	5
3	6	/**
4	7	* A class to display a language switcher on frontend
5	8	*
		@@ -12,9 +15,9 @@
12	15	* either strings to display the options or default values
13	16	*
14	17	* @since 0.7
15	18	*
16		- * @param string $type optional either 'menu' or 'widget', defaults to 'widget'
	19	+ * @param string $type optional either 'menu', 'widget' or 'block', defaults to 'widget'
17	20	* @param string $key optional either 'string' or 'default', defaults to 'string'
18	21	* @return array list of switcher options strings or default values
19	22	*/
20	23	public static function get_switcher_options( $type = 'widget', $key = 'string' ) {
		@@ -25,9 +28,8 @@
25	28	'force_home' => array( 'string' => __( 'Forces link to front page', 'polylang' ), 'default' => 0 ),
26	29	'hide_current' => array( 'string' => __( 'Hides the current language', 'polylang' ), 'default' => 0 ),
27	30	'hide_if_no_translation' => array( 'string' => __( 'Hides languages with no translation', 'polylang' ), 'default' => 0 ),
28	31	);
29		-
30	32	return wp_list_pluck( $options, $key );
31	33	}
32	34
33	35	/**
		@@ -51,10 +53,12 @@
51	53	$slug = $language->slug;
52	54	$locale = $language->get_locale( 'display' );
53	55	$classes = array( 'lang-item', 'lang-item-' . $id, 'lang-item-' . esc_attr( $slug ) );
54	56	$url = null; // Avoids potential notice
	57	+ $curlang = 0 === $args['admin_render'] ? $links->curlang->slug : $args['admin_current_lang'];
	58	+ $current_lang = $curlang == $slug;
55	59
56		- if ( $current_lang = $links->curlang->slug == $slug ) {
	60	+ if ( $current_lang ) {
57	61	if ( $args['hide_current'] && ! ( $args['dropdown'] && ! $args['raw'] ) ) {
58	62	continue; // Hide current language except for dropdown
59	63	} else {
60	64	$classes[] = 'current-lang';
		@@ -62,9 +66,9 @@
62	66	}
63	67
64	68	if ( null !== $args['post_id'] && ( $tr_id = $links->model->post->get( $args['post_id'], $language ) ) && $links->model->post->current_user_can_read( $tr_id ) ) {
65	69	$url = get_permalink( $tr_id );
66		- } elseif ( null === $args['post_id'] ) {
	70	+ } elseif ( null === $args['post_id'] && 0 === $args['admin_render'] ) {
67	71	$url = $links->get_translation_url( $language );
68	72	}
69	73
70	74	if ( $no_translation = empty( $url ) ) {
		@@ -89,9 +93,9 @@
89	93
90	94	$url = empty( $url ) || $args['force_home'] ? $links->get_home_url( $language ) : $url; // If the page is not translated, link to the home page
91	95
92	96	$name = $args['show_names'] || ! $args['show_flags'] || $args['raw'] ? ( 'slug' == $args['display_names_as'] ? $slug : $language->name ) : '';
93		- $flag = $args['raw'] && ! $args['show_flags'] ? $language->flag_url : ( $args['show_flags'] ? $language->flag : '' );
	97	+ $flag = $args['raw'] && ! $args['show_flags'] ? $language->get_display_flag_url() : ( $args['show_flags'] ? $language->get_display_flag() : '' );
94	98
95	99	if ( $first ) {
96	100	$classes[] = 'lang-item-first';
97	101	$first = false;
		@@ -120,8 +124,10 @@
120	124	* hide_current => hide the current language if set to 1, defaults to 0
121	125	* post_id => returns links to translations of post defined by post_id if set, defaults not set
122	126	* raw => return a raw array instead of html markup if set to 1, defaults to 0
123	127	* item_spacing => whether to preserve or discard whitespace between list items, valid options are 'preserve' and 'discard', defaults to preserve
	128	+ * admin_render => allows to force the current language code in an admin context if set, default to 0. Need to set the admin_current_lang argument below
	129	+ * admin_current_lang => the current language code in an admin context. Need to set the admin_render to 1, defaults not set
124	130	*
125	131	* @since 0.1
126	132	*
127	133	* @param object $links instance of PLL_Frontend_Links
		@@ -142,8 +148,10 @@
142	148	'hide_current' => 0, // don't hide current language
143	149	'post_id' => null, // if not null, link to translations of post defined by post_id
144	150	'raw' => 0, // set this to true to build your own custom language switcher
145	151	'item_spacing' => 'preserve', // 'preserve' or 'discard' whitespace between list items
	152	+ 'admin_render' => 0, // make the switcher in an frontend context
	153	+ 'admin_current_lang' => null, // use when admin_render is set to 1, if not null use it instead of the current language
146	154	);
147	155	$args = wp_parse_args( $args, $defaults );
148	156
149	157	/**
		@@ -168,9 +176,9 @@
168	176
169	177	if ( $args['dropdown'] ) {
170	178	$args['name'] = 'lang_choice_' . $args['dropdown'];
171	179	$walker = new PLL_Walker_Dropdown();
172		- $args['selected'] = $links->curlang->slug;
	180	+ $args['selected'] = 0 === $args['admin_render'] ? $links->curlang->slug : $args['admin_current_lang'];
173	181	}
174	182	else {
175	183	$walker = new PLL_Walker_List();
176	184	}
		@@ -185,9 +193,9 @@
185	193	*/
186	194	$out = apply_filters( 'pll_the_languages', $walker->walk( $elements, -1, $args ), $args );
187	195
188	196	// Javascript to switch the language when using a dropdown list
189		- if ( $args['dropdown'] ) {
	197	+ if ( $args['dropdown'] && 0 === $args['admin_render'] ) {
190	198	// Accept only few valid characters for the urls_x variable name ( as the widget id includes '-' which is invalid )
191	199	$out .= sprintf(
192	200	'<script type="text/javascript">
193	201	//<![CDATA[