← All changes | include/widget-languages.php +39 -54 2.7 → 3.6.7 View file →

		@@ -1,5 +1,8 @@
1	1	<?php
	2	+/**
	3	+ * @package Polylang
	4	+ */
2	5
3	6	/**
4	7	* The language switcher widget
5	8	*
		@@ -29,28 +32,55 @@
29	32	* @since 0.1
30	33	*
31	34	* @param array $args Display arguments including before_title, after_title, before_widget, and after_widget.
32	35	* @param array $instance The settings for the particular instance of the widget
	36	+ * @return void
33	37	*/
34	38	public function widget( $args, $instance ) {
35		- // Sets a unique id for dropdown
36		- $instance['dropdown'] = empty( $instance['dropdown'] ) ? 0 : $args['widget_id'];
	39	+ // Sets a unique id for dropdown.
	40	+ $instance['dropdown'] = empty( $instance['dropdown'] ) ? 0 : $this->id;
	41	+ $instance['echo'] = 0;
	42	+ $instance['raw'] = 0;
	43	+ $list = pll_the_languages( $instance );
37	44
38		- if ( $list = pll_the_languages( array_merge( $instance, array( 'echo' => 0 ) ) ) ) {
	45	+ if ( $list ) {
39	46	$title = empty( $instance['title'] ) ? '' : $instance['title'];
	47	+
40	48	/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
41	49	$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
42	50
43	51	echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
	52	+
44	53	if ( $title ) {
45	54	echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput
46	55	}
	56	+
	57	+ // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
	58	+ $aria_label = trim( wp_strip_all_tags( $title ) );
	59	+ if ( ! $aria_label ) {
	60	+ $aria_label = __( 'Choose a language', 'polylang' );
	61	+ }
	62	+
47	63	if ( $instance['dropdown'] ) {
48		- echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html__( 'Choose a language', 'polylang' ) . '</label>';
	64	+ echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html( $aria_label ) . '</label>';
49	65	echo $list; // phpcs:ignore WordPress.Security.EscapeOutput
50	66	} else {
	67	+ $format = current_theme_supports( 'html5', 'navigation-widgets' ) ? 'html5' : 'xhtml';
	68	+
	69	+ /** This filter is documented in wp-includes/widgets/class-wp-nav-menu-widget.php */
	70	+ $format = apply_filters( 'navigation_widgets_format', $format );
	71	+
	72	+ if ( 'html5' === $format ) {
	73	+ echo '<nav aria-label="' . esc_attr( $aria_label ) . '">';
	74	+ }
	75	+
51	76	echo "<ul>\n" . $list . "</ul>\n"; // phpcs:ignore WordPress.Security.EscapeOutput
	77	+
	78	+ if ( 'html5' === $format ) {
	79	+ echo '</nav>';
	80	+ }
52	81	}
	82	+
53	83	echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
54	84	}
55	85	}
56	86
		@@ -62,9 +92,9 @@
62	92	* @param array $new_instance New settings for this instance as input by the user via form()
63	93	* @param array $old_instance Old settings for this instance
64	94	* @return array Settings to save or bool false to cancel saving
65	95	*/
66		- public function update( $new_instance, $old_instance ) {
	96	+ public function update( $new_instance, $old_instance ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
67	97	$instance = array( 'title' => sanitize_text_field( $new_instance['title'] ) );
68	98	foreach ( array_keys( PLL_Switcher::get_switcher_options( 'widget' ) ) as $key ) {
69	99	$instance[ $key ] = ! empty( $new_instance[ $key ] ) ? 1 : 0;
70	100	}
		@@ -72,13 +102,14 @@
72	102	return $instance;
73	103	}
74	104
75	105	/**
76		- * Displays the widget form
	106	+ * Displays the widget form.
77	107	*
78	108	* @since 0.4
79	109	*
80		- * @param array $instance Current settings
	110	+ * @param array $instance Current settings.
	111	+ * @return string
81	112	*/
82	113	public function form( $instance ) {
83	114	// Default values
84	115	$instance = wp_parse_args( (array) $instance, array_merge( array( 'title' => '' ), PLL_Switcher::get_switcher_options( 'widget', 'default' ) ) );
		@@ -104,53 +135,7 @@
104	135	esc_attr( 'pll-' . $key )
105	136	);
106	137	}
107	138
108		- // FIXME echoing script in form is not very clean
109		- // but it does not work if enqueued properly :
110		- // clicking save on a widget makes this code unreachable for the just saved widget ( ?! )
111		- $this->admin_print_script();
112		- }
113		-
114		- /**
115		- * Add javascript to control the language switcher options
116		- *
117		- * @since 1.3
118		- */
119		- public function admin_print_script() {
120		- static $done = false;
121		-
122		- if ( $done ) {
123		- return;
124		- }
125		-
126		- $done = true;
127		- ?>
128		- <script type='text/javascript'>
129		- //<![CDATA[
130		- jQuery( document ).ready( function( $ ) {
131		- function pll_toggle( a, test ) {
132		- test ? a.show() : a.hide();
133		- }
134		-
135		- // Remove all options if dropdown is checked
136		- $( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll-dropdown', function() {
137		- var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
138		- pll_toggle( $( '.no-dropdown-' + this_id ), 'checked' != $( this ).attr( 'checked' ) );
139		- } );
140		-
141		- // Disallow unchecking both show names and show flags
142		- var options = ['-show_flags', '-show_names'];
143		- $.each( options, function( i, v ) {
144		- $( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll' + v, function() {
145		- var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
146		- if ( 'checked' != $( this ).attr( 'checked' ) ) {
147		- $( '#widget-' + this_id + options[ 1-i ] ).prop( 'checked', true );
148		- }
149		- } );
150		- } );
151		- } );
152		- //]]>
153		- </script>
154		- <?php
	139	+ return ''; // Because the parent class returns a string, however not used.
155	140	}
156	141	}