Changeset 2424335 for polylang

polylang/trunk/admin/admin-base.php

-                      r2398436
+                      r2424335
     public function __construct( &$links_model ) {
         parent::__construct( $links_model );
-        // Plugin i18n, only needed for backend
-        load_plugin_textdomain( 'polylang' );
         // Adds the link to the languages panel in the WordPress admin menu
 …
         <script type="text/javascript">
             if (typeof jQuery != 'undefined') {
+                (function($){
+                    $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
+                        if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) {
+                            if ( 'undefined' === typeof options.data ) {
+                                options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>' : <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>;
+                            } else {
+                                if ( 'string' === typeof options.data ) {
+                                    if ( '' === options.data && 'get' === options.type.toLowerCase() ) {
+                                        options.url = options.url+'&<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>';
+                jQuery(
+                    function($){
+                        $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
+                            if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) {
+                                if ( 'undefined' === typeof options.data ) {
+                                    options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>' : <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>;
+                                } else {
+                                    if ( 'string' === typeof options.data ) {
+                                        if ( '' === options.data && 'get' === options.type.toLowerCase() ) {
+                                            options.url = options.url+'&<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>';
+                                        } else {
+                                            try {
+                                                var o = JSON.parse(options.data);
+                                                o = $.extend(o, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
+                                                options.data = JSON.stringify(o);
+                                            }
+                                            catch(e) {
+                                                options.data = '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>&'+options.data;
+                                            }
+                                        }
                                     } else {
+                                        try {
+                                            var o = $.parseJSON(options.data);
+                                            o = $.extend(o, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
+                                            options.data = JSON.stringify(o);
+                                        }
+                                        catch(e) {
+                                            options.data = '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>&'+options.data;
+                                        }
+                                        options.data = $.extend(options.data, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
+                                    }
-                                } else {
-                                    options.data = $.extend(options.data, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
+                                }
+                            }
+                        }
                     });
                 })(jQuery)
+                        });
+                    }
+                );
+            }
         </script>
 …
             $this->curlang = $this->model->get_language( sanitize_key( $_REQUEST['lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
+        }
+        // Inform that the admin language has been set.
+        if ( $this->curlang ) {
+            /** This action is documented in frontend/choose-lang.php */
+            do_action( 'pll_language_defined', $this->curlang->slug, $this->curlang );
+        } else {
+            /** This action is documented in include/class-polylang.php */
+            do_action( 'pll_no_language_defined' ); // To load overridden textdomains.
+        }
+    }
 …
         $this->set_current_language();
+        // Inform that the admin language has been set
+        // Only if the admin language is one of the Polylang defined language
+        if ( $curlang = $this->model->get_language( get_user_locale() ) ) {
+            /** This action is documented in frontend/choose-lang.php */
+            do_action( 'pll_language_defined', $curlang->slug, $curlang );
+        } else {
+            /** This action is documented in include/class-polylang.php */
+            do_action( 'pll_no_language_defined' ); // to load overridden textdomains
+        }
+        // Plugin i18n, only needed for backend.
+        load_plugin_textdomain( 'polylang' );
+    }
 …
      * Fixes https://wordpress.org/support/topic/notice-undefined-offset-0-in-wp-includesqueryphp-on-line-3877 introduced in WP 4.1
+     *
      * @see the suggestion of @boonebgorges, https://core.trac.wordpress.org/ticket/31246
+     * @see https://core.trac.wordpress.org/ticket/31246 the suggestion of @boonebgorges.
+     *
      * @since 1.6.5

polylang/trunk/admin/admin-classic-editor.php

-                      r2340428
+                      r2424335
         // Adds the Languages box in the 'Edit Post' and 'Edit Page' panels
         add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 10, 2 );
+        add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ) );
         // Ajax response for changing the language in the post metabox
 …
+     *
      * @param string $post_type Current post type
+     * @param object $post      Current post
+     */
+    public function add_meta_boxes( $post_type, $post ) {
+     */
+    public function add_meta_boxes( $post_type ) {
         if ( $this->model->is_translated_post_type( $post_type ) ) {
             add_meta_box(
 …
         $post_type = get_post_type( $post_ID );
         // phpcs:ignore WordPress.Security.NonceVerification, WordPressVIPMinimum.Variables.VariableAnalysis.UnusedVariable
+        // phpcs:ignore WordPress.Security.NonceVerification, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
         $from_post_id = isset( $_GET['from_post'] ) ? (int) $_GET['from_post'] : 0;

polylang/trunk/admin/admin-filters-columns.php

-                      r2340428
+                      r2424335
         // Quick edit and bulk edit.
         add_filter( 'quick_edit_custom_box', array( $this, 'quick_edit_custom_box' ), 10, 2 );
         add_filter( 'bulk_edit_custom_box', array( $this, 'quick_edit_custom_box' ), 10, 2 );
+        add_filter( 'quick_edit_custom_box', array( $this, 'quick_edit_custom_box' ) );
+        add_filter( 'bulk_edit_custom_box', array( $this, 'quick_edit_custom_box' ) );
         // Adds the language column in the 'Categories' and 'Post Tags' tables.
 …
+     *
      * @param string $column column name
-     * @param string $type either 'edit-tags' for terms list table or post type for posts list table
      * @return string unmodified $column
      */
     public function quick_edit_custom_box( $column, $type ) {
+    public function quick_edit_custom_box( $column ) {
         if ( $column == $this->get_first_language_column() ) {

polylang/trunk/admin/admin-filters-term.php

-                      r2349002
+                      r2424335
         $term_id  = $tag->term_id;
         $taxonomy = $tag->taxonomy; // phpcs:ignore WordPressVIPMinimum.Variables.VariableAnalysis.UnusedVariable
+        $taxonomy = $tag->taxonomy; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
         $lang = $this->model->term->get_language( $term_id );
 …
         $lang      = $this->model->get_language( sanitize_key( $_POST['lang'] ) );
         $term_id   = isset( $_POST['term_id'] ) ? (int) $_POST['term_id'] : null; // phpcs:ignore WordPressVIPMinimum.Variables.VariableAnalysis.UnusedVariable
         $taxonomy  = sanitize_key( $_POST['taxonomy'] ); // phpcs:ignore WordPressVIPMinimum.Variables.VariableAnalysis.UnusedVariable
+        $term_id   = isset( $_POST['term_id'] ) ? (int) $_POST['term_id'] : null; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+        $taxonomy  = sanitize_key( $_POST['taxonomy'] );
         $post_type = sanitize_key( $_POST['post_type'] );

polylang/trunk/admin/admin-filters.php

-                      r2340428
+                      r2424335
         add_filter( 'themes_update_check_locales', array( $this, 'update_check_locales' ) );
         add_filter( 'plugins_update_check_locales', array( $this, 'update_check_locales' ) );
-        // We need specific filters for German and Danish
-        $specific_locales = array( 'da_DK', 'de_DE', 'de_DE_formal', 'de_CH', 'de_CH_informal', 'ca', 'sr_RS', 'bs_BA' );
-        if ( array_intersect( $this->model->get_languages_list( array( 'fields' => 'locale' ) ), $specific_locales ) ) {
-            add_filter( 'sanitize_title', array( $this, 'sanitize_title' ), 10, 3 );
-            add_filter( 'sanitize_user', array( $this, 'sanitize_user' ), 10, 3 );
+        }
         add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
 …
     /**
      * Allows to update translations files for plugins and themes
+     * Allows to update translations files for plugins and themes.
+     *
      * @since 1.6
+     *
      * @param array $locales Not used
      * @return array list of locales to update
+     * @param array $locales List of locales to update for plugins and themes.
+     * @return array
      */
     public function update_check_locales( $locales ) {
+        return $this->model->get_languages_list( array( 'fields' => 'locale' ) );
+    }
+    /**
+     * Filters the locale according to the current language instead of the language
+     * of the admin interface
+     *
+     * @since 2.0
+     *
+     * @param string $locale
+     * @return string
+     */
+    public function get_locale( $locale ) {
+        if ( isset( $_POST['post_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['post_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+            $locale = $lang->locale;
+        } elseif ( isset( $_POST['term_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['term_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+            $locale = $lang->locale;
+        } elseif ( isset( $_POST['inline_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['inline_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+            $locale = $lang->locale;
+        } elseif ( ! empty( $this->curlang ) ) {
+            $locale = $this->curlang->locale;
+        }
+        return $locale;
+    }
+    /**
+     * Maybe fix the result of sanitize_title() in case the languages include German or Danish
+     * Without this filter, if language of the title being sanitized is different from the language
+     * used for the admin interface and if one this language is German or Danish, some specific
+     * characters such as ä, ö, ü, ß are incorrectly sanitized.
+     *
+     * @since 2.0
+     *
+     * @param string $title     Sanitized title.
+     * @param string $raw_title The title prior to sanitization.
+     * @param string $context   The context for which the title is being sanitized.
+     * @return string
+     */
+    public function sanitize_title( $title, $raw_title, $context ) {
+        static $once = false;
+        if ( ! $once && 'save' == $context && ! empty( $title ) ) {
+            $once = true;
+            add_filter( 'locale', array( $this, 'get_locale' ), 20 ); // After the filter for the admin interface
+            $title = sanitize_title( $raw_title, '', $context );
+            remove_filter( 'locale', array( $this, 'get_locale' ), 20 );
+            $once = false;
+        }
+        return $title;
+    }
+    /**
+     * Maybe fix the result of sanitize_user() in case the languages include German or Danish
+     *
+     * @since 2.0
+     *
+     * @param string $username     Sanitized username.
+     * @param string $raw_username The username prior to sanitization.
+     * @param bool   $strict       Whether to limit the sanitization to specific characters. Default false.
+     * @return string
+     */
+    public function sanitize_user( $username, $raw_username, $strict ) {
+        static $once = false;
+        if ( ! $once ) {
+            $once = true;
+            add_filter( 'locale', array( $this, 'get_locale' ), 20 ); // After the filter for the admin interface
+            $username = sanitize_user( $raw_username, '', $strict );
+            remove_filter( 'locale', array( $this, 'get_locale' ), 20 );
+            $once = false;
+        }
+        return $username;
+        return array_merge( $locales, $this->model->get_languages_list( array( 'fields' => 'locale' ) ) );
+    }

polylang/trunk/admin/admin-model.php

r2340428	r2424335
260	260	* Validates data entered when creating or updating a language
261	261	*
262		* @see PLL_Admin_Model::add_language
	262	* @see PLL_Admin_Model::add_language()
263	263	*
264	264	* @since 0.4

polylang/trunk/admin/admin-strings.php

-                      r2340428
+                      r2424335
     public static function &get_strings() {
         self::$default_strings = array(
-            'options' => array(
-                'blogname'        => __( 'Site Title', 'polylang' ),
-                'blogdescription' => __( 'Tagline', 'polylang' ),
-                'date_format'     => __( 'Date Format', 'polylang' ),
-                'time_format'     => __( 'Time Format', 'polylang' ),
-            ),
             'widget_title' => __( 'Widget title', 'polylang' ),
             'widget_text'  => __( 'Widget text', 'polylang' ),
         );
-        // WP strings
-        foreach ( self::$default_strings['options'] as $option => $string ) {
-            self::register_string( $string, get_option( $option ), 'WordPress' );
+        }
         // Widgets titles
 …
      */
     public static function sanitize_string_translation( $translation, $name ) {
-        if ( false !== ( $option = array_search( $name, self::$default_strings['options'], true ) ) ) {
-            $translation = sanitize_option( $option, $translation );
+        }
         if ( $name == self::$default_strings['widget_title'] ) {
             $translation = sanitize_text_field( $translation );

polylang/trunk/admin/admin.php

-                      r2340428
+                      r2424335
+ *
  * Properties:
+ * options         => inherited, reference to Polylang options array
+ * model           => inherited, reference to PLL_Model object
+ * links_model     => inherited, reference to PLL_Links_Model object
+ * links           => inherited, reference to PLL_Admin_Links object
+ * static_pages    => inherited, reference to PLL_Admin_Static_Pages object
+ * filters_links   => inherited, reference to PLL_Filters_Links object
+ * curlang         => inherited, optional, current language used to filter the content (language of the post or term being edited, equal to filter_lang otherwise)
+ * filter_lang     => inherited, optional, current status of the admin languages filter (in the admin bar)
+ * pref_lang       => inherited, preferred language used as default when saving posts or terms
+ * posts           => reference to PLL_CRUD_Posts object
+ * terms           => reference to PLL_CRUD_Terms object
+ * filters         => reference to PLL_Admin_Filters object
+ * filters_columns => reference to PLL_Admin_Filters_Columns object
+ * filters_post    => reference to PLL_Admin_Filters_Post object
+ * filters_term    => reference to PLL_Admin_filters_Term object
+ * nav_menu        => reference to PLL_Admin_Nav_Menu object
+ * block_editor    => reference to PLL_Admin_Block_Editor object
+ * classic_editor  => reference to PLL_Admin_Classic_Editor object
+ * filters_media   => optional, reference to PLL_Admin_Filters_Media object
+ * options              => inherited, reference to Polylang options array
+ * model                => inherited, reference to PLL_Model object
+ * links_model          => inherited, reference to PLL_Links_Model object
+ * links                => inherited, reference to PLL_Admin_Links object
+ * static_pages         => inherited, reference to PLL_Admin_Static_Pages object
+ * filters_links        => inherited, reference to PLL_Filters_Links object
+ * curlang              => inherited, optional, current language used to filter the content (language of the post or term being edited, equal to filter_lang otherwise)
+ * filter_lang          => inherited, optional, current status of the admin languages filter (in the admin bar)
+ * pref_lang            => inherited, preferred language used as default when saving posts or terms
+ * posts                => reference to PLL_CRUD_Posts object
+ * terms                => reference to PLL_CRUD_Terms object
+ * filters              => reference to PLL_Admin_Filters object
+ * filters_sanitization => reference to PLL_Filters_Sanitization object
+ * filters_columns      => reference to PLL_Admin_Filters_Columns object
+ * filters_post         => reference to PLL_Admin_Filters_Post object
+ * filters_term         => reference to PLL_Admin_filters_Term object
+ * nav_menu             => reference to PLL_Admin_Nav_Menu object
+ * block_editor         => reference to PLL_Admin_Block_Editor object
+ * classic_editor       => reference to PLL_Admin_Classic_Editor object
+ * filters_media        => optional, reference to PLL_Admin_Filters_Media object
+ *
  * @since 1.2
  */
 class PLL_Admin extends PLL_Admin_Base {
+    public $filters, $filters_columns, $filters_post, $filters_term, $nav_menu, $filters_media;
+    /**
+     * Instance of PLL_Admin_Filters
+     *
+     * @var PLL_Admin_Filters
+     */
+    public $filters;
+    /**
+     * Instance of PLL_Admin_Filters_Columns
+     *
+     * @var PLL_Admin_Filters_Columns
+     */
+    public $filters_columns;
+    /**
+     * Instance of PLL_Admin_Filters_Post
+     *
+     * @var PLL_Admin_Filters_Post
+     */
+    public $filters_post;
+    /**
+     * Instance of PLL_Admin_filters_Term
+     *
+     * @var PLL_Admin_filters_Term
+     */
+    public $filters_term;
+    /**
+     * Instance of PLL_Admin_Nav_Menu
+     *
+     * @var PLL_Admin_Nav_Menu
+     */
+    public $nav_menu;
+    /**
+     * Instance of PLL_Admin_Filters_Media
+     *
+     * @var PLL_Admin_Filters_Media
+     */
+    public $filters_media;
+    /**
+     * Instance of PLL_Filters_Sanitization
+     *
+     * @since 2.9
+     *
+     * @var PLL_Filters_Sanitization
+     */
+    public $filters_sanitization;
     /**
 …
      */
     public function add_filters() {
+        $this->filters_sanitization = new PLL_Filters_Sanitization( $this->get_locale_for_sanitization() );
         // All these are separated just for convenience and maintainability
         $classes = array( 'Filters', 'Filters_Columns', 'Filters_Post', 'Filters_Term', 'Nav_Menu', 'Classic_Editor', 'Block_Editor' );
 …
+        }
+    }
+    /**
+     * Retrieve the locale according to the current language instead of the language
+     * of the admin interface.
+     *
+     * @since 2.0
+     *
+     * @return string
+     */
+    public function get_locale_for_sanitization() {
+        $locale = get_locale();
+        if ( isset( $_POST['post_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['post_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+            $locale = $lang->locale;
+        } elseif ( isset( $_POST['term_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['term_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+            $locale = $lang->locale;
+        } elseif ( isset( $_POST['inline_lang_choice'] ) && $lang = $this->model->get_language( sanitize_key( $_POST['inline_lang_choice'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+            $locale = $lang->locale;
+        } elseif ( ! empty( $this->curlang ) ) {
+            $locale = $this->curlang->locale;
+        }
+        return $locale;
+    }
+}

polylang/trunk/css/admin.css

-                      r2340428
+                      r2424335
+}
+.translation {
+    display: flex; /* fix #691 to remove default margin bottom */
+}
+@media screen and (max-width: 782px) { /* reset default display property for small device */
+    .translation{
+        display: block;
+    }
+}
+.translation textarea{
+    display: block; /* fix #691 to remove default margin bottom */
+}
 .translation input,
 .translation textarea {
     width: 72%;
+    box-sizing: border-box; /* to be sure field don't overrun outside their wrapper */
+    margin-bottom: 4px; /* fix #691 set the same margin bottom for both textarea and input tags */
+}
 …
+}
+/* Metaboxes holder in Strings translations screen */
+.languages_page_mlang_strings .metabox-holder > div {
+    display: flex;
+}
+.languages_page_mlang_strings .metabox-holder > div > div {
+    flex-grow: 1;
+}
+.languages_page_mlang_strings .metabox-holder > div > div:nth-child(2n) {
+    margin-left: 1rem;
+}
+.languages_page_mlang_strings .metabox-holder > div > div.closed {
+    border:0;
+    background: none;
+}
+.languages_page_mlang_strings .metabox-holder > div > div.closed .postbox-header{
+    border: 1px solid #ccd0d4;
+    background: #fff;
+}
 @media screen and ( max-width: 782px ) {
     /* settings */
 …
+    }
+    .translation input {
+    .translation input,
+    .translation textarea {
         width: 95%;
+    }
+    /* Metaboxes holder in Strings translations screen */
+    .languages_page_mlang_strings .metabox-holder > div {
+        flex-direction: column;
+    }
+    .languages_page_mlang_strings .metabox-holder > div > div:nth-child(2n) {
+        margin-left: 0;
+    }

polylang/trunk/css/admin.min.css

r2349002	r2424335
1		#add-lang select{width:95%}.column-locale,.languages .column-slug{width:15%}.column-default_lang{width:5%}.column-count,.column-flag,.column-term_group{width:10%}.icon-default-lang:before{font-family:dashicons;content:"\f155"}.pll-icon:before{display:inline-block;text-align:left;width:15px}.pll-circle:before{content:"\25cf"}.form-field input[type=radio]{width:auto;margin-right:2px}#pll-about-box p,#pll-recommended p{text-align:justify}#pll-about-box input{margin:0;padding:0;float:right}.stringstranslations .column-context,.stringstranslations .column-name{width:10%}.stringstranslations .column-string{width:33%}.translation label{display:inline-block;width:23%;vertical-align:top}.translation input,.translation textarea{width:72%}.pll-settings{margin-top:20px}.pll-settings .plugin-title{width:25%}#wpbody-content .pll-settings .pll-configure tr{display:table-row}#wpbody-content .pll-settings .pll-configure td{display:table-cell}#wpbody-content .pll-settings .pll-configure>td{padding:20px 20px 20px 40px}.pll-configure legend{font-size:14px;font-weight:600;margin-bottom:.5em}.pll-configure td .description{margin-top:2px;margin-bottom:.5em}.pll-configure p.submit{margin-top:20px}.pll-configure .button{margin-right:20px}.pll-configure fieldset{margin-bottom:1.5em}.pll-inline-block-list{margin:0}.pll-inline-block-list li{display:inline-block;margin:0;width:250px}#pll-domains-table td{padding:2px 2px 2px 1.5em;-webkit-box-shadow:none;box-shadow:none;border:none}.pll-settings-url-col{display:inline-block;width:49%;vertical-align:top}#pll-licenses-table td{vertical-align:top}#pll-licenses-table label{font-size:1em;font-weight:600}.pll-configure .pll-deactivate-license{margin:0 0 0 20px}.wp-list-table td[class=column-language_],.wp-list-table th[class=column-language_]{width:1.5em;box-sizing:content-box}.pll-dir-rtl input[type=text],.pll-dir-rtl textarea{direction:rtl}.pll-dir-ltr input[type=text],.pll-dir-ltr textarea{direction:ltr}.pll-dir-ltr .tr_lang,.pll-dir-rtl .tr_lang{direction:inherit}#post-translations p{float:left}#post-translations table{table-layout:fixed;width:100%;clear:both}#post-translations a{text-decoration:none}#post-translations .pll-column-icon,#post-translations .pll-language-column{width:20px}#post-translations .tr_lang{width:100%}#post-translations td{padding:2px}#post-translations .spinner,#term-translations .spinner{float:none;margin:0;background-position:center;width:auto}.pll-column-icon{text-align:center}#select-post-language .pll-select-flag{padding:4px;margin-right:32px}#select-media-language .pll-select-flag{padding:4px;margin-right:10px}.pll-media-edit-column{float:right}.pll-translation-flag{margin-right:14px}#select-add-term-language .pll-select-flag{padding:11px;margin-right:13px}#select-edit-term-language .pll-select-flag{padding:11px;margin-right:4px}#term-translations p{font-weight:400;font-style:normal;padding:2px;color:#23282d}#add-term-translations,#edit-term-translations{width:95%}#term-translations .pll-language-column{line-height:28px;width:20%}#add-term-translations .pll-language-column,#term-translations .pll-edit-column{width:20px}#edit-term-translations .pll-language-column{padding:15px 10px;font-weight:400}.pll_icon_add:before{content:"\f132"}.pll_icon_edit:before{content:"\f464"}[class^=pll_icon_]{font:20px/1 dashicons;vertical-align:middle}#wpadminbar #wp-admin-bar-languages .ab-item img{margin:0 8px 0 2px}#wpadminbar #wp-admin-bar-languages #wp-admin-bar-all .ab-item .ab-icon{float:none;top:4px}#wpadminbar #wp-admin-bar-languages .ab-icon:before{content:"\f326";top:1px}.pll-notice.notice{padding-right:38px;position:relative}.pll-notice a.notice-dismiss{text-decoration:none}.pll-notice .button{margin-right:10px}@media screen and (max-width:782px){#wpbody-content .pll-settings .pll-configure>td{padding:20px}#wpbody-content .pll-settings #cb{padding:20px 9px}.pll-inline-block{width:auto}.pll-settings-url-col{display:block;width:100%}#wpbody-content .pll-settings #pll-licenses-table td{display:block}.pll-configure .pll-deactivate-license{margin:10px 0 5px}.stringstranslations .column-context,.stringstranslations .column-name{display:none}.translation label{display:block;width:95%;padding-left:0}.translation input{width:95%}#edit-term-translations .pll-language-name,#select-add-term-language .pll-select-flag,#select-edit-term-language .pll-select-flag{display:none}#edit-term-translations{width:100%}#add-term-translations .pll-language-column{line-height:38px}#edit-term-translations td{padding:8px 10px}#edit-term-translations .pll-edit-column,#edit-term-translations .pll-language-column{width:20px}.term-translations .pll-edit-column,.term-translations .pll-language-column,.term-translations .pll-translation-column{display:table-cell}.term-translations .hidden{display:none}#wpadminbar #wp-admin-bar-languages{display:block}#wpadminbar #wp-admin-bar-languages>.ab-item{width:50px;text-align:center}#wpadminbar #wp-admin-bar-languages>.ab-item .ab-icon:before{font:32px/1 dashicons;top:-1px}#wpadminbar #wp-admin-bar-languages>.ab-item img{margin:19px 0}#wpadminbar #wp-admin-bar-languages #wp-admin-bar-all .ab-item .ab-icon{margin-right:6px;font-size:20px!important;line-height:20px!important}}
	1	#add-lang select{width:95%}.column-locale,.languages .column-slug{width:15%}.column-default_lang{width:5%}.column-count,.column-flag,.column-term_group{width:10%}.icon-default-lang:before{font-family:dashicons;content:"\f155"}.pll-icon:before{display:inline-block;text-align:left;width:15px}.pll-circle:before{content:"\25cf"}.form-field input[type=radio]{width:auto;margin-right:2px}#pll-about-box p,#pll-recommended p{text-align:justify}#pll-about-box input{margin:0;padding:0;float:right}.stringstranslations .column-context,.stringstranslations .column-name{width:10%}.stringstranslations .column-string{width:33%}.translation label{display:inline-block;width:23%;vertical-align:top}.translation{display:flex}@media screen and (max-width:782px){.translation{display:block}}.translation textarea{display:block}.translation input,.translation textarea{width:72%;box-sizing:border-box;margin-bottom:4px}.pll-settings{margin-top:20px}.pll-settings .plugin-title{width:25%}#wpbody-content .pll-settings .pll-configure tr{display:table-row}#wpbody-content .pll-settings .pll-configure td{display:table-cell}#wpbody-content .pll-settings .pll-configure>td{padding:20px 20px 20px 40px}.pll-configure legend{font-size:14px;font-weight:600;margin-bottom:.5em}.pll-configure td .description{margin-top:2px;margin-bottom:.5em}.pll-configure p.submit{margin-top:20px}.pll-configure .button{margin-right:20px}.pll-configure fieldset{margin-bottom:1.5em}.pll-inline-block-list{margin:0}.pll-inline-block-list li{display:inline-block;margin:0;width:250px}#pll-domains-table td{padding:2px 2px 2px 1.5em;-webkit-box-shadow:none;box-shadow:none;border:none}.pll-settings-url-col{display:inline-block;width:49%;vertical-align:top}#pll-licenses-table td{vertical-align:top}#pll-licenses-table label{font-size:1em;font-weight:600}.pll-configure .pll-deactivate-license{margin:0 0 0 20px}.wp-list-table td[class=column-language_],.wp-list-table th[class=column-language_]{width:1.5em;box-sizing:content-box}.pll-dir-rtl input[type=text],.pll-dir-rtl textarea{direction:rtl}.pll-dir-ltr input[type=text],.pll-dir-ltr textarea{direction:ltr}.pll-dir-ltr .tr_lang,.pll-dir-rtl .tr_lang{direction:inherit}#post-translations p{float:left}#post-translations table{table-layout:fixed;width:100%;clear:both}#post-translations a{text-decoration:none}#post-translations .pll-column-icon,#post-translations .pll-language-column{width:20px}#post-translations .tr_lang{width:100%}#post-translations td{padding:2px}#post-translations .spinner,#term-translations .spinner{float:none;margin:0;background-position:center;width:auto}.pll-column-icon{text-align:center}#select-post-language .pll-select-flag{padding:4px;margin-right:32px}#select-media-language .pll-select-flag{padding:4px;margin-right:10px}.pll-media-edit-column{float:right}.pll-translation-flag{margin-right:14px}#select-add-term-language .pll-select-flag{padding:11px;margin-right:13px}#select-edit-term-language .pll-select-flag{padding:11px;margin-right:4px}#term-translations p{font-weight:400;font-style:normal;padding:2px;color:#23282d}#add-term-translations,#edit-term-translations{width:95%}#term-translations .pll-language-column{line-height:28px;width:20%}#add-term-translations .pll-language-column,#term-translations .pll-edit-column{width:20px}#edit-term-translations .pll-language-column{padding:15px 10px;font-weight:400}.pll_icon_add:before{content:"\f132"}.pll_icon_edit:before{content:"\f464"}[class^=pll_icon_]{font:20px/1 dashicons;vertical-align:middle}#wpadminbar #wp-admin-bar-languages .ab-item img{margin:0 8px 0 2px}#wpadminbar #wp-admin-bar-languages #wp-admin-bar-all .ab-item .ab-icon{float:none;top:4px}#wpadminbar #wp-admin-bar-languages .ab-icon:before{content:"\f326";top:1px}.pll-notice.notice{padding-right:38px;position:relative}.pll-notice a.notice-dismiss{text-decoration:none}.pll-notice .button{margin-right:10px}.languages_page_mlang_strings .metabox-holder>div{display:flex}.languages_page_mlang_strings .metabox-holder>div>div{flex-grow:1}.languages_page_mlang_strings .metabox-holder>div>div:nth-child(2n){margin-left:1rem}.languages_page_mlang_strings .metabox-holder>div>div.closed{border:0;background:0 0}.languages_page_mlang_strings .metabox-holder>div>div.closed .postbox-header{border:1px solid #ccd0d4;background:#fff}@media screen and (max-width:782px){#wpbody-content .pll-settings .pll-configure>td{padding:20px}#wpbody-content .pll-settings #cb{padding:20px 9px}.pll-inline-block{width:auto}.pll-settings-url-col{display:block;width:100%}#wpbody-content .pll-settings #pll-licenses-table td{display:block}.pll-configure .pll-deactivate-license{margin:10px 0 5px}.stringstranslations .column-context,.stringstranslations .column-name{display:none}.translation label{display:block;width:95%;padding-left:0}.translation input,.translation textarea{width:95%}.languages_page_mlang_strings .metabox-holder>div{flex-direction:column}.languages_page_mlang_strings .metabox-holder>div>div:nth-child(2n){margin-left:0}#edit-term-translations .pll-language-name,#select-add-term-language .pll-select-flag,#select-edit-term-language .pll-select-flag{display:none}#edit-term-translations{width:100%}#add-term-translations .pll-language-column{line-height:38px}#edit-term-translations td{padding:8px 10px}#edit-term-translations .pll-edit-column,#edit-term-translations .pll-language-column{width:20px}.term-translations .pll-edit-column,.term-translations .pll-language-column,.term-translations .pll-translation-column{display:table-cell}.term-translations .hidden{display:none}#wpadminbar #wp-admin-bar-languages{display:block}#wpadminbar #wp-admin-bar-languages>.ab-item{width:50px;text-align:center}#wpadminbar #wp-admin-bar-languages>.ab-item .ab-icon:before{font:32px/1 dashicons;top:-1px}#wpadminbar #wp-admin-bar-languages>.ab-item img{margin:19px 0}#wpadminbar #wp-admin-bar-languages #wp-admin-bar-all .ab-item .ab-icon{margin-right:6px;font-size:20px!important;line-height:20px!important}}

polylang/trunk/css/selectmenu.css

-                      r2277053
+                      r2424335
+}
+/* for jQuery UI 1.12 which introduces a wrapper */
+.ui-menu .ui-menu-item:not([role]) {
+    padding: 0;
+}
+.ui-menu-item-wrapper {
+    padding: 3px 1em 3px 2em;
+}
 .rtl .ui-menu .ui-menu-item {
     text-align: right;
+}
 /* icon support */
 …
+}
 .ui-menu-icons .ui-menu-item {
+.ui-menu-icons .ui-menu-item[role] {
     padding-left: 2em;
+}
+.rtl .ui-menu-icons .ui-menu-item {
+.rtl .ui-menu-item-wrapper, /* for jQuery UI 1.12 which introduces a wrapper */
+.rtl .ui-menu-icons .ui-menu-item[role] {
     padding-left: 1em;
     padding-right: 2em;
 …
     position: relative;
     text-decoration: none;
+    box-sizing: border-box; /* To keep width calculation in percent since WP 5.6 */
+}
 …
     right: 0.5em;
     left: auto;
+    margin-top: -10px;
+    position: absolute;
+    top: 50%;
+    position: absolute;
+    top: 26%;
+    width: 16px;
+    height: 16px;
     text-indent: 0; /* due to text-indent for jquery ui-dialog in wizard */
+}
 …
 .ui-widget-content,
 .ui-state-default,
+.ui-selectmenu-button-closed, /* To be compatible jQuery UI 1.12.1 since WordPress 5.6 */
+.ui-selectmenu-button-open, /* To be compatible jQuery UI 1.12.1 since WordPress 5.6 */
 .ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
 …
     color: #32373c;
+}
+/* Override to have same styles as WP form styles since WordPress 5.4 */
+.toplevel_page_mlang .ui-selectmenu-button.ui-state-default,
+.toplevel_page_mlang .ui-selectmenu-button.ui-selectmenu-button-closed, /* To be compatible jQuery UI 1.12.1 since WordPress 5.6 */
+.toplevel_page_mlang .ui-selectmenu-button.ui-selectmenu-button-open{ /* To be compatible jQuery UI 1.12.1 since WordPress 5.6 */
+    box-shadow: 0 0 0 transparent;
+    border-radius: 4px;
+    border: 1px solid #7e8993;
+}
+.toplevel_page_mlang .ui-selectmenu-button:focus{
+    color: #016087; /* Same color as WordPress focused select HTML tag */
+    border-color: #007cba;
+    box-shadow: 0 0 0 1px #007cba;
+    outline: 2px solid transparent;
+}
+.toplevel_page_mlang .ui-menu-item {
+    color: #016087; /* Same color as option in a WordPress focused select HTML tag */
+}
 .ui-widget-content .ui-state-hover,
+.ui-widget-content .ui-state-focus {
+    background: #f5f5f5;
+.ui-widget-content .ui-state-focus,
+.ui-widget-content .ui-state-active { /* To be compatible jQuery UI 1.12.1 since WordPress 5.6 */
+    background: #d5d5d5;
+}
 …
 .ui-icon-triangle-1-s:before {
+    content: "\f140";
+    font: 20px/1 'dashicons';
+    content: "";
+    background: #fff url(data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2220%22%20height%3D%2220%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M5%206l5%205%205-5%202%201-7%207-7-7%202-1z%22%20fill%3D%22%23555%22%2F%3E%3C%2Fsvg%3E) no-repeat right 0px top 55%;
+    background-size: 16px 16px;
+    box-sizing: border-box;
+    position: absolute;
+    width: 16px;
+    height: 16px;
+}
+.pll-wizard .ui-button:hover,
+.pll-wizard .ui-button:focus {
+    background: #fff; /* To override jQuery ui-dialog styles provided by WordPress */
+}

polylang/trunk/css/selectmenu.min.css

r2277053	r2424335
1		.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}.rtl .ui-menu .ui-menu-item{text-align:right}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.rtl .ui-menu-icons .ui-menu-item{padding-left:1em;padding-right:2em}.ui-menu .ui-icon,.ui-selectmenu-text .ui-icon{position:absolute;top:0;bottom:0;left:.3em;margin:auto 0}.rtl .ui-menu .ui-icon,.rtl .ui-selectmenu-text .ui-icon{right:.3em;left:auto}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:700;line-height:23px;padding:2px .4em;margin:.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-button{display:inline-block;overflow:hidden;position:relative;text-decoration:none}.ui-selectmenu-button span.ui-icon{right:.5em;left:auto;margin-top:-10px;position:absolute;top:50%;text-indent:0}.rtl .ui-selectmenu-button span.ui-icon{left:.5em;right:auto}.ui-selectmenu-button span.ui-selectmenu-text{text-align:left;padding:.2em 2.1em .2em 2em;display:block;line-height:23px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.rtl .ui-selectmenu-button span.ui-selectmenu-text{text-align:right;padding:.2em 2em .2em 2.1em}.ui-state-default,.ui-widget-content,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{background:#fff;border:1px solid #ddd;box-shadow:0 1px 2px rgba(0,0,0,.07) inset;color:#32373c}.ui-widget-content .ui-state-focus,.ui-widget-content .ui-state-hover{background:#f5f5f5}.ui-selectmenu-button.ui-state-focus{border:1px solid #5b9dd9;box-shadow:0 0 2px rgba(30,140,190,.8)}.ui-icon-triangle-1-s:before{content:"\f140";font:20px/1 dashicons}.ui-widget-content{max-height:231px;box-shadow:0 2px 6px rgba(100,100,100,.3)}
	1	.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}.ui-menu .ui-menu-item:not([role]){padding:0}.ui-menu-item-wrapper{padding:3px 1em 3px 2em}.rtl .ui-menu .ui-menu-item{text-align:right}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item[role]{padding-left:2em}.rtl .ui-menu-icons .ui-menu-item[role],.rtl .ui-menu-item-wrapper{padding-left:1em;padding-right:2em}.ui-menu .ui-icon,.ui-selectmenu-text .ui-icon{position:absolute;top:0;bottom:0;left:.3em;margin:auto 0}.rtl .ui-menu .ui-icon,.rtl .ui-selectmenu-text .ui-icon{right:.3em;left:auto}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:700;line-height:23px;padding:2px .4em;margin:.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-button{display:inline-block;overflow:hidden;position:relative;text-decoration:none;box-sizing:border-box}.ui-selectmenu-button span.ui-icon{right:.5em;left:auto;position:absolute;top:26%;width:16px;height:16px;text-indent:0}.rtl .ui-selectmenu-button span.ui-icon{left:.5em;right:auto}.ui-selectmenu-button span.ui-selectmenu-text{text-align:left;padding:.2em 2.1em .2em 2em;display:block;line-height:23px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.rtl .ui-selectmenu-button span.ui-selectmenu-text{text-align:right;padding:.2em 2em .2em 2.1em}.ui-selectmenu-button-closed,.ui-selectmenu-button-open,.ui-state-default,.ui-widget-content,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{background:#fff;border:1px solid #ddd;box-shadow:0 1px 2px rgba(0,0,0,.07) inset;color:#32373c}.toplevel_page_mlang .ui-selectmenu-button.ui-selectmenu-button-closed,.toplevel_page_mlang .ui-selectmenu-button.ui-selectmenu-button-open,.toplevel_page_mlang .ui-selectmenu-button.ui-state-default{box-shadow:0 0 0 transparent;border-radius:4px;border:1px solid #7e8993}.toplevel_page_mlang .ui-selectmenu-button:focus{color:#016087;border-color:#007cba;box-shadow:0 0 0 1px #007cba;outline:2px solid transparent}.toplevel_page_mlang .ui-menu-item{color:#016087}.ui-widget-content .ui-state-active,.ui-widget-content .ui-state-focus,.ui-widget-content .ui-state-hover{background:#d5d5d5}.ui-selectmenu-button.ui-state-focus{border:1px solid #5b9dd9;box-shadow:0 0 2px rgba(30,140,190,.8)}.ui-icon-triangle-1-s:before{content:"";background:#fff url(data:image/svg+xml;charset=US-ASCII,%3Csvg%20width%3D%2220%22%20height%3D%2220%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M5%206l5%205%205-5%202%201-7%207-7-7%202-1z%22%20fill%3D%22%23555%22%2F%3E%3C%2Fsvg%3E) no-repeat right 0 top 55%;background-size:16px 16px;box-sizing:border-box;position:absolute;width:16px;height:16px}.pll-wizard .ui-button:focus,.pll-wizard .ui-button:hover{background:#fff}.ui-widget-content{max-height:231px;box-shadow:0 2px 6px rgba(100,100,100,.3)}

polylang/trunk/frontend/frontend-filters-links.php

-                      r2349002
+                      r2424335
+        }
+        elseif ( $this->links_model->using_permalinks && is_category() && ! empty( $wp_query->query['cat'] ) ) {
+            // When we receive a plain permaling with a cat query var, we need to redirect to the pretty permalink.
+            if ( $this->model->is_translated_taxonomy( $this->get_queried_taxonomy( $wp_query->tax_query ) ) ) {
+                $term_id = $this->get_queried_term_id( $wp_query->tax_query );
+                $language = $this->model->term->get_language( $term_id );
+                $redirect_url = $this->maybe_add_page_to_redirect_url( get_term_link( $term_id ) );
+            }
+        }
         elseif ( is_category() || is_tag() || is_tax() ) {
+            // We need to switch the language when there is no language provided in a pretty permalink.
             $obj = $wp_query->get_queried_object();
             if ( ! empty( $obj ) && $this->model->is_translated_taxonomy( $obj->taxonomy ) ) {
 …
+        }
+        elseif ( is_404() && ! empty( $wp_query->tax_query ) ) {
+            // When a wrong language is passed through a pretty permalink, we just need to switch the language.
+            if ( $this->model->is_translated_taxonomy( $this->get_queried_taxonomy( $wp_query->tax_query ) ) ) {
+                $term_id = $this->get_queried_term_id( $wp_query->tax_query );
+                $language = $this->model->term->get_language( $term_id );
+            }
+        }
+        elseif ( $this->links_model->using_permalinks && $wp_query->is_posts_page && ! empty( $wp_query->query['page_id'] ) && $id = get_query_var( 'page_id' ) ) {
+            $language = $this->model->post->get_language( (int) $id );
+            $redirect_url = $this->maybe_add_page_to_redirect_url( get_permalink( $id ) );
+        }
         elseif ( $wp_query->is_posts_page ) {
             $obj = $wp_query->get_queried_object();
             $language = $this->model->post->get_language( (int) $obj->ID );
+        }
-        elseif ( is_404() && ! empty( $wp_query->query['page_id'] ) && $id = get_query_var( 'page_id' ) ) {
-            // Special case for page shortlinks when using subdomains or multiple domains
-            // Needed because redirect_canonical doesn't accept to change the domain name
-            $language = $this->model->post->get_language( (int) $id );
+        }
 …
         return $redirect_url;
+    }
+    /**
+     * Returns the link to the paged page if requested.
+     *
+     * @since 2.9
+     *
+     * @param string $redirect_url The url to redirect to.
+     * @return string
+     */
+    protected function maybe_add_page_to_redirect_url( $redirect_url ) {
+        global $wp_query;
+        if ( ! empty( $wp_query->query['paged'] ) && $page = get_query_var( 'paged' ) ) {
+            $redirect_url = $this->links_model->add_paged_to_link( $redirect_url, $page );
+        }
+        return $redirect_url;
+    }
+    /**
+     * Returns the term_id of the requested term.
+     *
+     * @since 2.9
+     *
+     * @param object $tax_query An instance of WP_Tax_Query.
+     * @return int
+     */
+    protected function get_queried_term_id( $tax_query ) {
+        $queried_terms = $tax_query->queried_terms;
+        $taxonomy = $this->get_queried_taxonomy( $tax_query );
+        $field = $queried_terms[ $taxonomy ]['field'];
+        $term  = reset( $queried_terms[ $taxonomy ]['terms'] );
+        // We can get a term_id when requesting a plain permalink, eg /?cat=1.
+        if ( 'term_id' === $field ) {
+            return $term;
+        }
+        // We get a slug when requesting a pretty permalink with the wrong language.
+        $args = array(
+            'lang' => '',
+            'taxonomy' => $taxonomy,
+            $field => $term,
+            'hide_empty' => false,
+            'fields' => 'ids',
+        );
+        $terms = get_terms( $args );
+        return reset( $terms );
+    }
+    /**
+     * Find the taxonomy being queried.
+     *
+     * @since 2.9
+     *
+     * @param object $tax_query An instance of WP_Tax_Query.
+     * @return string A taxonomy slug
+     */
+    protected function get_queried_taxonomy( $tax_query ) {
+        $queried_terms = $tax_query->queried_terms;
+        unset( $queried_terms['language'] );
+        return key( $queried_terms );
+    }
+}

polylang/trunk/frontend/frontend-filters.php

-                      r2349002
+                      r2424335
         // Filters the widgets according to the current language
         add_filter( 'widget_display_callback', array( $this, 'widget_display_callback' ), 10, 2 );
+        add_filter( 'widget_display_callback', array( $this, 'widget_display_callback' ) );
         add_filter( 'sidebars_widgets', array( $this, 'sidebars_widgets' ) );
 …
         // Strings translation ( must be applied before WordPress applies its default formatting filters )
         foreach ( array( 'widget_text', 'widget_title', 'option_blogname', 'option_blogdescription', 'option_date_format', 'option_time_format' ) as $filter ) {
+        foreach ( array( 'widget_text', 'widget_title' ) as $filter ) {
             add_filter( $filter, 'pll__', 1 );
+        }
 …
         // Translates biography
         add_filter( 'get_user_metadata', array( $this, 'get_user_metadata' ), 10, 4 );
-        // Support theme customizer
-        // FIXME of course does not work if 'transport' is set to 'postMessage'
-        if ( isset( $_POST['wp_customize'], $_POST['customized'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-            add_filter( 'pre_option_blogname', 'pll__', 20 );
-            add_filter( 'pre_option_blogdescription', 'pll__', 20 );
+        }
         // FIXME test get_user_locale for backward compatibility with WP < 4.7
 …
      * @since 0.1
+     *
-     * @param string $locale
      * @return string
      */
     public function get_locale( $locale ) {
+    public function get_locale() {
         return $this->curlang->locale;
+    }
 …
      * @since 0.3
+     *
+     * @param array  $instance Widget settings
+     * @param object $widget   WP_Widget object
+     * @param array $instance Widget settings
      * @return bool|array false if we hide the widget, unmodified $instance otherwise
      */
     public function widget_display_callback( $instance, $widget ) {
+    public function widget_display_callback( $instance ) {
         // FIXME it looks like this filter is useless, now the we use the filter sidebars_widgets
         return ! empty( $instance['pll_lang'] ) && $instance['pll_lang'] != $this->curlang->slug ? false : $instance;

polylang/trunk/frontend/frontend-static-pages.php

-                      r2412239
+                      r2424335
         // Manages the redirection of the homepage
         add_filter( 'redirect_canonical', array( $this, 'redirect_canonical' ), 10, 2 );
+        add_filter( 'redirect_canonical', array( $this, 'redirect_canonical' ) );
         add_filter( 'pll_pre_translation_url', array( $this, 'pll_pre_translation_url' ), 10, 3 );
 …
+     *
      * @param string $redirect_url
-     * @param string $requested_url
      * @return bool|string modified url, false if redirection is canceled
      */
     public function redirect_canonical( $redirect_url, $requested_url ) {
+    public function redirect_canonical( $redirect_url ) {
         global $wp_query;
         if ( is_page() && ! is_feed() && isset( $wp_query->queried_object ) && $wp_query->queried_object->ID == $this->curlang->page_on_front ) {

polylang/trunk/include/api.php

r2340428	r2424335
131	131	* @param bool $multiline optional whether the string table should display a multiline textarea or a single line input, defaults to single line
132	132	*/
133		function pll_register_string( $name, $string, $context = 'polylang', $multiline = false ) {
	133	function pll_register_string( $name, $string, $context = 'Polylang', $multiline = false ) {
134	134	if ( PLL() instanceof PLL_Admin_Base ) {
135	135	PLL_Admin_Strings::register_string( $name, $string, $context, $multiline );

polylang/trunk/include/base.php

-                      r2340428
+                      r2424335
             $this->posts = new PLL_CRUD_Posts( $this );
             $this->terms = new PLL_CRUD_Terms( $this );
+            // WordPress options.
+            new PLL_Translate_Option( 'blogname', array(), array( 'context' => 'WorPress' ) );
+            new PLL_Translate_Option( 'blogdescription', array(), array( 'context' => 'WorPress' ) );
+            new PLL_Translate_Option( 'date_format', array(), array( 'context' => 'WorPress' ) );
+            new PLL_Translate_Option( 'time_format', array(), array( 'context' => 'WorPress' ) );
+        }
+    }

polylang/trunk/include/class-polylang.php

-                      r2340428
+                      r2424335
         } elseif ( self::is_rest_request() ) {
             $class = 'PLL_REST_Request';
         } elseif ( $model->get_languages_list() && empty( $_GET['deactivate-polylang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+        } elseif ( $model->get_languages_list() ) {
             $class = 'PLL_Frontend';
+        }
 …
             // Loads the modules.
             foreach ( glob( POLYLANG_DIR . '/modules/*/load.php', GLOB_NOSORT ) as $load_script ) { // phpcs:ignore WordPressVIPMinimum.Variables.VariableAnalysis.UnusedVariable
+            foreach ( glob( POLYLANG_DIR . '/modules/*/load.php', GLOB_NOSORT ) as $load_script ) {
                 require_once $load_script; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable
+            }

polylang/trunk/include/functions.php

-                      r2398436
+                      r2424335
     function wpcom_vip_get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
         return get_page_by_path( $page_path, $output, $post_type ); // phpcs:ignore WordPressVIPMinimum.Functions.RestrictedFunctions.get_page_by_path_get_page_by_path
+    }
+}
-if ( ! function_exists( 'wp_doing_ajax' ) ) {
-    /**
-     * Determines whether the current request is a WordPress Ajax request.
-     * Backward compatibility function for WP < 4.7
+     *
-     * @since 2.2
+     *
-     * @return bool True if it's a WordPress Ajax request, false otherwise.
-     */
-    function wp_doing_ajax() {
-        /** This filter is documented in wp-includes/load.php */
-        return apply_filters( 'wp_doing_ajax', defined( 'DOING_AJAX' ) && DOING_AJAX );
+    }
+}
-if ( ! function_exists( 'wp_doing_cron' ) ) {
-    /**
-     * Determines whether the current request is a WordPress cron request.
-     * Backward compatibility function for WP < 4.8
+     *
-     * @since 2.6
+     *
-     * @return bool True if it's a WordPress cron request, false otherwise.
-     */
-    function wp_doing_cron() {
-        /** This filter is documented in wp-includes/load.php */
-        return apply_filters( 'wp_doing_cron', defined( 'DOING_CRON' ) && DOING_CRON );
+    }
+}
-if ( ! function_exists( 'wp_using_themes' ) ) {
-    /**
-     * Determines whether the current request should use themes.
-     * Backward compatibility function for WP < 5.1
+     *
-     * @since 2.6
+     *
-     * @return bool True if themes should be used, false otherwise.
-     */
-    function wp_using_themes() {
-        /** This filter is documented in wp-includes/load.php */
-        return apply_filters( 'wp_using_themes', defined( 'WP_USE_THEMES' ) && WP_USE_THEMES );
+    }
+}

polylang/trunk/include/mo.php

-                      r2340428
+                      r2424335
         wp_cache_delete( 'polylang_mo_ids' );
+    }
+    /**
+     * Deletes a string
+     *
+     * @since 2.9
+     *
+     * @param string $string The source string to remove from the translations.
+     */
+    public function delete_entry( $string ) {
+        unset( $this->entries[ $string ] );
+    }
+}

polylang/trunk/include/olt-manager.php

-                      r2340428
+                      r2424335
         // Now we can load all overridden text domains with the right language
         if ( ! empty( $this->list_textdomains ) ) {
+            // Since WP 4.7 we need to reset the internal cache of _get_path_to_translation when switching from any locale to en_US
+            // See WP_Locale_Switcher::change_locale()
+            // FIXME test _get_path_to_translation for backward compatibility with WP < 4.7
+            if ( function_exists( '_get_path_to_translation' ) ) {
+            /*
+             * FIXME: Backward compatibility with WP < 5.6
+             * From WP 4.7 to 5.5, we need to reset the internal cache of _get_path_to_translation when switching from any locale to en_US.
+             * See WP_Locale_Switcher::change_locale()
+             */
+            if ( ! class_exists( 'WP_Textdomain_Registry' ) && function_exists( '_get_path_to_translation' ) ) {
                 _get_path_to_translation( null, true );
+            }
 …
     /**
      * FIXME: Backward compatibility with Polylang for WooCommerce < 0.3.4
      * To remove in Polylang 2.1
+     * Was formerly hooked to the filter 'override_load_textdomain'
+     *
      * @since 0.1
+     *
+     * @param bool   $bool   not used
+     * @param string $domain text domain name
+     * @param string $mofile translation file name
+     * @param bool $bool Whether to override the .mo file loading.
      * @return bool
      */
     public function mofile( $bool, $domain, $mofile ) {
+    public function mofile( $bool ) {
         return $bool;
+    }

polylang/trunk/include/switcher.php

r2340428	r2424335
36	36	* Get the language elements for use in a walker
37	37	*
38		* @see ~~list of parameters accepted in $args documented for PLL_Switcher::the_language~~s
	38	* @see PLL_Switcher::the_languages() for the list of parameters accepted in $args
39	39	*
40	40	* @since 1.2

polylang/trunk/include/translated-object.php

-                      r2340428
+                      r2424335
         if ( ! empty( $term ) ) {
             $d = maybe_unserialize( $term->description );
+            $slug = array_search( $id, $this->get_translations( $id ) ); // in case some plugin stores the same value with different key
+            unset( $d[ $slug ] );
+            if ( is_array( $d ) ) {
+                $slug = array_search( $id, $this->get_translations( $id ) ); // In case some plugin stores the same value with different key.
+                unset( $d[ $slug ] );
+            }
             if ( empty( $d ) ) {
                 wp_delete_term( (int) $term->term_id, $this->tax_translations );
+            }
+            else {
+            } else {
                 wp_update_term( (int) $term->term_id, $this->tax_translations, array( 'description' => maybe_serialize( $d ) ) );
+            }
 …
         global $wpdb;
         $tt_id = $this->tax_tt;
+        return $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $lang->$tt_id ) );
+        $last_changed = wp_cache_get_last_changed( 'terms' );
+        $cache_key    = "polylang:get_objects_in_language:{$lang->$tt_id}:{$last_changed}";
+        $cache        = wp_cache_get( $cache_key, 'terms' );
+        if ( false === $cache ) {
+            $object_ids = $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $lang->$tt_id ) );
+            wp_cache_set( $cache_key, $object_ids, 'terms' );
+        } else {
+            $object_ids = (array) $cache;
+        }
+        if ( ! $object_ids ) {
+            return array();
+        }
+        return $object_ids;
+    }

polylang/trunk/include/walker-dropdown.php

-                      r2340428
+                      r2424335
      * @param int    $current_object_id ID of the current item.
      */
     public function start_el( &$output, $element, $depth = 0, $args = array(), $current_object_id = 0 ) {
+    public function start_el( &$output, $element, $depth = 0, $args = array(), $current_object_id = 0 ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
         $value = $args['value'];
         $output .= sprintf(
 …
      * @param string $output            Passed by reference. Used to append additional content.
      */
     public function display_element( $element, &$children_elements, $max_depth, $depth = 0, $args, &$output ) {
+    public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
         $element = (object) $element; // Make sure we have an object
         $element->parent = $element->id = 0; // Don't care about this

polylang/trunk/include/walker-list.php

-                      r2340428
+                      r2424335
      * @param int    $current_object_id ID of the current item.
      */
     public function start_el( &$output, $element, $depth = 0, $args = array(), $current_object_id = 0 ) {
+    public function start_el( &$output, $element, $depth = 0, $args = array(), $current_object_id = 0 ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
         $output .= sprintf(
             '%6$s<li class="%1$s"><a lang="%2$s" hreflang="%2$s" href="%3$s">%4$s%5$s</a></li>%7$s',
 …
      * @param string $output            Passed by reference. Used to append additional content.
      */
     public function display_element( $element, &$children_elements, $max_depth, $depth = 0, $args, &$output ) {
+    public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
         $element = (object) $element; // Make sure we have an object
         $element->parent = $element->id = 0; // Don't care about this

polylang/trunk/include/widget-calendar.php

r2340428	r2424335
105	105	// Let's figure out when we are.
106	106	if ( ! empty( $monthnum ) && ! empty( $year ) ) {
107		$thismonth = zeroise( ~~intval( $monthnum )~~, 2 );
	107	$thismonth = zeroise( (int) $monthnum, 2 );
108	108	$thisyear = (int) $year;
109	109	} elseif ( ! empty( $w ) ) {

polylang/trunk/include/widget-languages.php

-                      r2343963
+                      r2424335
      */
     public function widget( $args, $instance ) {
         // Sets a unique id for dropdown
+        // Sets a unique id for dropdown.
         $instance['dropdown'] = empty( $instance['dropdown'] ) ? 0 : $args['widget_id'];
         if ( $list = pll_the_languages( array_merge( $instance, array( 'echo' => 0 ) ) ) ) {
             $title = empty( $instance['title'] ) ? '' : $instance['title'];
             /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
             $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
             echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
             if ( $title ) {
                 echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput
+            }
+            // The title may be filtered: Strip out HTML and make sure the aria-label is never empty.
+            $aria_label = trim( wp_strip_all_tags( $title ) );
+            if ( ! $aria_label ) {
+                $aria_label = __( 'Choose a language', 'polylang' );
+            }
             if ( $instance['dropdown'] ) {
                 echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html__( 'Choose a language', 'polylang' ) . '</label>';
+                echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html( $aria_label ) . '</label>';
                 echo $list; // phpcs:ignore WordPress.Security.EscapeOutput
             } else {
+                $format = current_theme_supports( 'html5', 'navigation-widgets' ) ? 'html5' : 'xhtml';
+                /** This filter is documented in wp-includes/widgets/class-wp-nav-menu-widget.php */
+                $format = apply_filters( 'navigation_widgets_format', $format );
+                if ( 'html5' === $format ) {
+                    echo '<nav role="navigation" aria-label="' . esc_attr( $aria_label ) . '">';
+                }
                 echo "<ul>\n" . $list . "</ul>\n"; // phpcs:ignore WordPress.Security.EscapeOutput
+                if ( 'html5' === $format ) {
+                    echo '</nav>';
+                }
+            }
             echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
+        }
 …
      * @return array Settings to save or bool false to cancel saving
      */
     public function update( $new_instance, $old_instance ) {
+    public function update( $new_instance, $old_instance ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
         $instance = array( 'title' => sanitize_text_field( $new_instance['title'] ) );
         foreach ( array_keys( PLL_Switcher::get_switcher_options( 'widget' ) ) as $key ) {
 …
             );
+        }
-        // FIXME echoing script in form is not very clean
-        // but it does not work if enqueued properly :
-        // clicking save on a widget makes this code unreachable for the just saved widget ( ?! )
-        $this->admin_print_script();
+    }
-    /**
-     * Add javascript to control the language switcher options
+     *
-     * @since 1.3
-     */
-    public function admin_print_script() {
-        static $done = false;
-        if ( $done ) {
-            return;
+        }
-        $done = true;
-        ?>
-        <script type='text/javascript'>
-            //<![CDATA[
-            jQuery( document ).ready( function( $ ) {
-                function pll_toggle( a, test ) {
-                    test ? a.show() : a.hide();
+                }
-                // Remove all options if dropdown is checked
-                $( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll-dropdown', function() {
-                    var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
-                    pll_toggle( $( '.no-dropdown-' + this_id ), true != $( this ).prop( 'checked' ) );
-                } );
-                // Disallow unchecking both show names and show flags
-                var options = ['-show_flags', '-show_names'];
-                $.each( options, function( i, v ) {
-                    $( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll' + v, function() {
-                        var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
-                        if ( true != $( this ).prop( 'checked' ) ) {
-                            $( '#widget-' + this_id + options[ 1-i ] ).prop( 'checked', true );
+                        }
-                    } );
-                } );
-            } );
-            //]]>
-        </script>
-        <?php
+    }
+}

polylang/trunk/install/install-base.php

-                      r2340428
+                      r2424335
         register_deactivation_hook( $plugin_basename, array( $this, 'deactivate' ) );
+        // Blog creation on multisite.
+        if ( version_compare( $GLOBALS['wp_version'], '5.1', '<' ) ) {
+            // FIXME: Backward compatibility with WP < 5.1.
+            add_action( 'wpmu_new_blog', array( $this, 'wpmu_new_blog' ), 5 ); // Before WP attempts to send mails which can break on some PHP versions
+        } else {
+            add_action( 'wp_insert_site', array( $this, 'new_site' ) );
+        }
+        // Site creation on multisite.
+        add_action( 'wp_insert_site', array( $this, 'new_site' ) );
+    }
 …
         restore_current_blog();
+    }
-    /**
-     * Blog creation on multisite ( to set default options )
-     * Backward compatibility with WP < 5.1
+     *
-     * @since 0.9.4
+     *
-     * @param int $blog_id
-     */
-    public function wpmu_new_blog( $blog_id ) {
-        switch_to_blog( $blog_id );
-        $this->_activate();
-        restore_current_blog();
+    }
+}

polylang/trunk/install/plugin-updater.php

-                      r2340428
+                      r2424335
 /**
  * Allows plugins to use their own update API.
  * Modified version with 'polylang' text domain and comments for translators
+ * Modified version with 'polylang' text domain and comments for translators.
+ *
  * @author Easy Digital Downloads
  * @version 1.7.1
+ * @version 1.8.0
  */
 class PLL_Plugin_Updater {
 …
+        }
+        $current = $this->get_repo_api_data();
+        if ( false !== $current && is_object( $current ) && isset( $current->new_version ) ) {
+            if ( version_compare( $this->version, $current->new_version, '<' ) ) {
+                $_transient_data->response[ $this->name ] = $current;
+            } else {
+                // Populating the no_update information is required to support auto-updates in WordPress 5.5.
+                $_transient_data->no_update[ $this->name ] = $current;
+            }
+        }
+        $_transient_data->last_checked           = time();
+        $_transient_data->checked[ $this->name ] = $this->version;
+        return $_transient_data;
+    }
+    /**
+     * Get repo API data from store.
+     * Save to cache.
+     *
+     * @return \stdClass
+     */
+    public function get_repo_api_data() {
         $version_info = $this->get_cached_version_info();
         if ( false === $version_info ) {
+            $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug, 'beta' => $this->beta ) );
+            $version_info = $this->api_request(
+                'plugin_latest_version',
+                array(
+                    'slug' => $this->slug,
+                    'beta' => $this->beta,
+                )
+            );
+            if ( ! $version_info ) {
+                return false;
+            }
+            // This is required for your plugin to support auto-updates in WordPress 5.5.
+            $version_info->plugin = $this->name;
+            $version_info->id     = $this->name;
             $this->set_version_info_cache( $version_info );
+        }
+        if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+            $no_update = false;
+            if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+                $_transient_data->response[ $this->name ] = $version_info;
+                // Make sure the plugin property is set to the plugin's name/location. See issue 1463 on Software Licensing's GitHub repo.
+                $_transient_data->response[ $this->name ]->plugin = $this->name;
+            } else {
+                $no_update              = new stdClass();
+                $no_update->id          = '';
+                $no_update->slug        = $this->slug;
+                $no_update->plugin      = $this->name;
+                $no_update->new_version = $version_info->new_version;
+                $no_update->url         = $version_info->homepage;
+                $no_update->package     = isset( $version_info->package ) ? $version_info->package : ''; #modified#
+                $no_update->icons       = $version_info->icons;
+                $no_update->banners     = $version_info->banners;
+                $no_update->banners_rtl = array();
+            }
+            $_transient_data->last_checked           = time();
+            $_transient_data->checked[ $this->name ] = $this->version;
+            if ( $no_update ) {
+                $_transient_data->no_update[ $this->name ] = $no_update;
+            }
+        }
+        return $_transient_data;
+        }
+        return $version_info;
+    }
 …
         if ( empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
             $version_info = $this->get_cached_version_info();
+            $version_info = $this->get_repo_api_data();
             if ( false === $version_info ) {
 …
+            }
-            $no_update = false;
             if ( version_compare( $this->version, $version_info->new_version, '<' ) ) {
                 $update_cache->response[ $this->name ] = $version_info;
             } else {
+                $no_update              = new stdClass();
+                $no_update->id          = '';
+                $no_update->slug        = $this->slug;
+                $no_update->plugin      = $this->name;
+                $no_update->new_version = $version_info->new_version;
+                $no_update->url         = $version_info->homepage;
+                $no_update->package     = isset( $version_info->package ) ? $version_info->package : ''; #modified#
+                $no_update->icons       = $version_info->icons;
+                $no_update->banners     = $version_info->banners;
+                $no_update->banners_rtl = array();
+                $update_cache->no_update[ $this->name ] = $version_info;
+            }
             $update_cache->last_checked           = time();
             $update_cache->checked[ $this->name ] = $this->version;
-            if ( $no_update ) {
-                $update_cache->no_update[ $this->name ] = $no_update;
+            }
             set_site_transient( 'update_plugins', $update_cache );
 …
         if ( false === $edd_plugin_url_available[ $store_hash ] ) {
             return;
+            return false;
+        }
 …
         if ( $data['slug'] != $this->slug ) {
             return;
+        }
         if( $this->api_url == trailingslashit ( home_url() ) ) {
+            return false;
+        }
+        if ( $this->api_url == trailingslashit ( home_url() ) ) {
             return false; // Don't allow a plugin to ping itself
+        }
 …
+        }
         if( ! empty( $request->sections ) ) {
+        if ( ! empty( $request->sections ) ) {
             foreach( $request->sections as $key => $section ) {
                 $request->$key = (array) $section;
 …
+}

polylang/trunk/integrations/integrations.php

r2340428	r2424335
26	26	protected function __construct() {
27	27	// Loads external integrations.
28		foreach ( glob( __DIR__ . '/*/load.php', GLOB_NOSORT ) as $load_script ) { // phpcs:ignore ~~WordPressVIPMinimum.Variables.VariableAnalysis.Unus~~edVariable
	28	foreach ( glob( __DIR__ . '/*/load.php', GLOB_NOSORT ) as $load_script ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
29	29	require_once $load_script; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.UsingVariable
30	30	}

polylang/trunk/integrations/jetpack/jetpack.php

-                      r2340428
+                      r2424335
     public function __construct() {
         add_action( 'init', array( $this, 'jetpack_init' ) );
         add_action( 'jetpack_widget_get_top_posts', array( $this, 'jetpack_widget_get_top_posts' ), 10, 3 );
         add_filter( 'grunion_contact_form_field_html', array( $this, 'grunion_contact_form_field_html_filter' ), 10, 3 );
+        add_action( 'jetpack_widget_get_top_posts', array( $this, 'jetpack_widget_get_top_posts' ) );
+        add_filter( 'grunion_contact_form_field_html', array( $this, 'grunion_contact_form_field_html_filter' ), 10, 2 );
         add_filter( 'jetpack_open_graph_tags', array( $this, 'jetpack_ogp' ) );
         add_filter( 'jetpack_relatedposts_filter_filters', array( $this, 'jetpack_relatedposts_filter_filters' ), 10, 2 );
 …
      * @since 1.5.4
+     *
+     * @param array  $posts    Array of the most popular posts.
+     * @param array  $post_ids Array of Post IDs.
+     * @param string $count    Number of Top Posts we want to display.
+     * @param array $posts Array of the most popular posts.
      * @return array
      */
     public function jetpack_widget_get_top_posts( $posts, $post_ids, $count ) {
+    public function jetpack_widget_get_top_posts( $posts ) {
         foreach ( $posts as $k => $post ) {
             if ( pll_current_language() !== pll_get_post_language( $post['post_id'] ) ) {
 …
      * @since 1.5.4
+     *
+     * @param string   $r           Contact Form HTML output.
+     * @param string   $field_label Field label.
+     * @param int|null $id          Post ID.
+     * @param string $r           Contact Form HTML output.
+     * @param string $field_label Field label.
      * @return string
      */
     public function grunion_contact_form_field_html_filter( $r, $field_label, $id ) {
+    public function grunion_contact_form_field_html_filter( $r, $field_label ) {
         if ( function_exists( 'icl_translate' ) ) {
             if ( pll_current_language() !== pll_default_language() ) {

polylang/trunk/integrations/twenty-seventeen/twenty-seven-teen.php

r2340428	r2424335
24	24	}
25	25
26		if ( PLL() instanceof PLL_Frontend ) {
27		add_filter( 'theme_mod_external_header_video', 'pll__' );
28		} else {
29		pll_register_string( __( 'Header video', 'polylang' ), get_theme_mod( 'external_header_video' ), 'Twenty Seventeen', false );
30		}
	26	$theme_slug = get_option( 'stylesheet' ); // In case we are using a child theme.
	27	new PLL_Translate_Option( "theme_mods_$theme_slug", array( 'external_header_video' => 1 ), array( 'context' => 'Twenty Seventeen' ) );
31	28	}
32	29	}

polylang/trunk/integrations/wp-sweep/wp-sweep.php

-                      r2340428
+                      r2424335
     public function init() {
         add_filter( 'wp_sweep_excluded_taxonomies', array( $this, 'wp_sweep_excluded_taxonomies' ) );
+        add_filter( 'wp_sweep_excluded_termids', array( $this, 'wp_sweep_excluded_termids' ), 0 );
+    }
 …
         return array_merge( $excluded_taxonomies, array( 'term_language', 'term_translations' ) );
+    }
+    /**
+     * Add the translation of the default taxonomy terms and our language terms to the excluded terms.
+     *
+     * @since 2.9
+     *
+     * @param array $excluded_term_ids List of term ids excluded from sweeping.
+     * @return array
+     */
+    public function wp_sweep_excluded_termids( $excluded_term_ids ) {
+        // We got a list of excluded terms (defaults and parents). Let exclude their translations too.
+        $_term_ids = array();
+        foreach ( $excluded_term_ids as $excluded_term_id ) {
+            $_term_ids = array_merge( $_term_ids, array_values( pll_get_term_translations( $excluded_term_id ) ) );
+        }
+        $excluded_term_ids = array_merge( $excluded_term_ids, $_term_ids );
+        // Add the terms of our languages.
+        $excluded_term_ids = array_merge(
+            $excluded_term_ids,
+            pll_languages_list( array( 'fields' => 'term_id' ) ),
+            pll_languages_list( array( 'fields' => 'tl_term_id' ) )
+        );
+        return array_unique( $excluded_term_ids );
+    }
+}

polylang/trunk/integrations/wpseo/wpseo.php

-                      r2412239
+                      r2424335
      */
     public function init() {
+        add_action( 'wp_loaded', array( $this, 'wpseo_translate_options' ) );
         if ( PLL() instanceof PLL_Frontend ) {
-            add_filter( 'option_wpseo_titles', array( $this, 'wpseo_translate_titles' ) );
             // Filters sitemap queries to remove inactive language or to get
             // one sitemap per language when using multiple domains or subdomains
 …
             add_filter( 'wpseo_breadcrumb_indexables', array( $this, 'breadcrumb_indexables' ) );
         } else {
-            add_action( 'admin_init', array( $this, 'wpseo_register_strings' ) );
             // Primary category
             add_filter( 'pll_copy_post_metas', array( $this, 'copy_post_metas' ) );
 …
     /**
+     * Registers strings for custom post types and custom taxonomies titles and meta descriptions
+     *
+     * @since 2.0
+     */
+    public function wpseo_register_strings() {
+        $options = get_option( 'wpseo_titles' );
+     * Registers custom post types and taxonomy titles for translation.
+     *
+     * @since 2.9
+     */
+    public function wpseo_translate_options() {
+        $keys = array();
         foreach ( get_post_types( array( 'public' => true, '_builtin' => false ) ) as $t ) {
             if ( pll_is_translated_post_type( $t ) ) {
+                $this->_wpseo_register_strings( $options, array( 'title-' . $t, 'metadesc-' . $t ) );
+            }
+        }
+                $keys[] = 'title-' . $t;
+                $keys[] = 'metadesc-' . $t;
+            }
+        }
         foreach ( get_post_types( array( 'has_archive' => true, '_builtin' => false ) ) as $t ) {
             if ( pll_is_translated_post_type( $t ) ) {
+                $this->_wpseo_register_strings( $options, array( 'title-ptarchive-' . $t, 'metadesc-ptarchive-' . $t, 'bctitle-ptarchive-' . $t ) );
+            }
+        }
+                $keys[] = 'title-ptarchive-' . $t;
+                $keys[] = 'metadesc-ptarchive-' . $t;
+                $keys[] = 'bctitle-ptarchive-' . $t;
+            }
+        }
         foreach ( get_taxonomies( array( 'public' => true, '_builtin' => false ) ) as $t ) {
             if ( pll_is_translated_taxonomy( $t ) ) {
+                $this->_wpseo_register_strings( $options, array( 'title-tax-' . $t, 'metadesc-tax-' . $t ) );
+            }
+        }
+    }
+    /**
+     * Helper function to translate custom post types and custom taxonomies titles and meta descriptions
+     *
+     * @since 2.1.6
+     *
+     * @param array $options
+     * @param array $titles
+     * @return array
+     */
+    protected function _wpseo_translate_titles( $options, $titles ) {
+        foreach ( $titles as $title ) {
+            if ( ! empty( $options[ $title ] ) ) {
+                $options[ $title ] = pll__( $options[ $title ] );
+            }
+        }
+        return $options;
+    }
+    /**
+     * Translates strings for custom post types and custom taxonomies titles and meta descriptions
+     *
+     * @since 2.0
+     *
+     * @param array $options
+     * @return array
+     */
+    public function wpseo_translate_titles( $options ) {
+        if ( PLL() instanceof PLL_Frontend ) {
+            foreach ( get_post_types( array( 'public' => true, '_builtin' => false ) ) as $t ) {
+                if ( pll_is_translated_post_type( $t ) ) {
+                    $options = $this->_wpseo_translate_titles( $options, array( 'title-' . $t, 'metadesc-' . $t ) );
+                }
+            }
+            foreach ( get_post_types( array( 'has_archive' => true, '_builtin' => false ) ) as $t ) {
+                if ( pll_is_translated_post_type( $t ) ) {
+                    $options = $this->_wpseo_translate_titles( $options, array( 'title-ptarchive-' . $t, 'metadesc-ptarchive-' . $t, 'bctitle-ptarchive-' . $t ) );
+                }
+            }
+            foreach ( get_taxonomies( array( 'public' => true, '_builtin' => false ) ) as $t ) {
+                if ( pll_is_translated_taxonomy( $t ) ) {
+                    $options = $this->_wpseo_translate_titles( $options, array( 'title-tax-' . $t, 'metadesc-tax-' . $t ) );
+                }
+            }
+        }
+        return $options;
+                $keys[] = 'title-tax-' . $t;
+                $keys[] = 'metadesc-tax-' . $t;
+            }
+        }
+        if ( ! empty( $keys ) ) {
+            new PLL_Translate_Option( 'wpseo_titles', array_fill_keys( $keys, 1 ), array( 'context' => 'wordpress-seo' ) );
+        }
+    }
 …
                 $presentation->model->permalink = pll_home_url();
                 $presentation->model->title = WPSEO_Options::get( 'title-home-wpseo' );
                 $presentation->model->description = WPSEO_Options::get( 'title-home-wpseo' );
+                $presentation->model->description = WPSEO_Options::get( 'metadesc-home-wpseo' );
                 break;
 …
     /**
-     * Helper function to register strings for custom post types and custom taxonomies titles and meta descriptions
+     *
-     * @since 2.1.6
+     *
-     * @param array $options
-     * @param array $titles
-     * @return array
-     */
-    protected function _wpseo_register_strings( $options, $titles ) {
-        foreach ( $titles as $title ) {
-            if ( ! empty( $options[ $title ] ) ) {
-                pll_register_string( $title, $options[ $title ], 'wordpress-seo' );
+            }
+        }
-        return $options;
+    }
-    /**
      * Synchronize the primary term
+     *

polylang/trunk/js/admin.js

-                      r2377116
+                      r2424335
  */
 jQuery( document ).ready(
+jQuery(
     function( $ ) {
-        var transitionTimeout;
         // languages list table
         // accessibility to row actions on focus
         // mainly copy paste of WP code from common.js
+        var transitionTimeout;
         $( 'table.languages' ).on(
             { // restricted to languages list table
                 focusin: function() {
                     clearTimeout( transitionTimeout );
                     focusedRowActions = $( this ).find( '.row-actions' );
+                    var focusedRowActions = $( this ).find( '.row-actions' );
                     // transitionTimeout is necessary for Firefox, but Chrome won't remove the CSS class without a little help.
                     $( '.row-actions' ).not( this ).removeClass( 'visible' );
 …
         ); // acts on the whole tr instead of single td as we have actions links in several columns
+        // Common functions for overriding language and flag dropdown list.
+        var selectmenuRenderItem = function( wrapper, item ) {
+            var li = $( '<li>' ).text( item.label ).prepend( $( item.element ).data( 'flag-html' ) );
+            li.children( 'img' ).addClass( 'ui-icon' );
+            return li.appendTo( wrapper );
+        /**
+         * Common functions and variables for overriding languages and flags dropdown list by a jQuery UI selectmenu widget.
+        */
+        // Add a boolean variable to be able to check jQuery UI >= 1.12 which is introduced in WP 5.6.
+        // Backward compatibility WP < 5.6
+        var isJqueryUImin112 = $.ui.version >= '1.12.0';
+        // Allow to check if a flag list dropdown is present. Not present in the Wizard steps or other settings page.
+        var flagListExist = $( "#flag_list" ).length;
+        // Allow to check if a language list dropdown is present. Not present in other settings page.
+        var langListExist = $( "#lang_list" ).length;
+        // jQuery UI selectmenu widget width option
+        var defaultSelectmenuWidth = '95%';
+        var wizardSelectmenuWidth = '100%';
+        // Inject flag image when jQuery UI selectmenu is created or an item is selected.
+        // jQuery UI 1.12 introduce a wrapper inside de li tag which is necessary to selectmenu widget to work correctly.
+        // Mainly copy from the orginal jQuery UI 1.12 selectmenu widget _renderItem method.
+        // Note this code works fine with jQuery UI 1.11.4 too.
+        var selectmenuRenderItem = function( ul, item ) {
+            var li = $( '<li>' );
+            var wrapper = $( '<div>');
+            if ( item.disabled ) {
+                this._addClass( li, null, "ui-state-disabled" );
+            }
+            this._setText( wrapper, item.label );
+            // Add the flag from the data attribute in the selected element.
+            wrapper.prepend( $( item.element ).data( 'flag-html' ) );
+            wrapper.children( 'img' ).addClass( 'ui-icon' );
+            return li.append( wrapper ).appendTo( ul );
         };
+        // Override selected item to inject flag for jQuery UI less than 1.12.
         var selectmenuRefreshButtonText = function( selectElement ) {
             var buttonText = $( selectElement ).selectmenu( 'instance' ).buttonText;
 …
             buttonText.children( 'img' ).addClass( 'ui-icon' );
         };
+        // Overrides the flag dropdown list with our customized jquery ui selectmenu.
+        // Inject flag image when jQuery UI selectmenu is created or an item is selected.
+        $( '#flag_list' ).on(
+            'selectmenucreate selectmenuselect',
+            function(){
+                selectmenuRefreshButtonText( this );
+            }
+        );
+        // Refresh jQuery UI selectmenu when the value is changed programmatically: select another language or edit an existing language.
+        // For putting the focus in the list on the selected item and injecting the right flag on the selected item.
+        $( '#flag_list' ).on(
+            'selectmenuopen',
+            function(){
+                $( this ).selectmenu( 'refresh' ).trigger( 'selectmenuselect' );
+            }
+        );
+        // Create the jQuery UI selectmenu widget
+        $( '#flag_list' ).selectmenu( { width: '100%' } );
+        // Overrides each item in the jQuery UI selectmenu list by injecting flag image.
+        $( '#flag_list' ).selectmenu( 'instance' )._renderItem = selectmenuRenderItem;
+        // Language choice in predefined languages in Polylang Languages settings page and wizard.
+        // Overrides the predefined language dropdown list with our customized jquery ui selectmenu.
+        // Inject flag image when jQuery UI selectmenu is created or an item is selected.
+        $( '#lang_list' ).on(
+            'selectmenucreate selectmenuselect',
+            function() {
+                selectmenuRefreshButtonText( this );
+            }
+        );
+        // Create the jQuery UI selectmenu widget
+        $( '#lang_list' ).selectmenu( { width: '100%' } );
+        // Overrides each element in the jQuery UI selectmenu list by injecting flag image.
+        $( '#lang_list' ).selectmenu( 'instance' )._renderItem = selectmenuRenderItem;
+        // Languages form
+        // Fills the fields based on the language dropdown list choice
+        $( '#add-lang #lang_list' ).on(
+            'selectmenuchange',
+            function() {
+                var value = $( this ).val().split( ':' );
+                var selected = $( "option:selected", this ).text().split( ' - ' );
+                $( '#lang_slug' ).val( value[0] );
+                $( '#lang_locale' ).val( value[1] );
+                $( 'input[name="rtl"]' ).val( [value[2]] );
+                $( '#lang_name' ).val( selected[0] );
+                $( '#flag_list').val( value[3] );
+                // Refresh the jQuery UI selectmenu flags list.
+                $( '#flag_list' ).selectmenu( 'refresh' ).trigger( 'selectmenuselect' );
+            }
+        );
+        // Override selected item since jQuery UI 1.12 which introduces extension point method _renderButtonItem.
+        // @see https://api.jqueryui.com/1.12/selectmenu/#method-_renderButtonItem _renderButtonItem documentation.
+        var selectmenuRenderButtonItem = function ( selectElement ) {
+            var buttonItem = $( '<span>' );
+            this._setText( buttonItem, selectElement.label );
+            this._addClass( buttonItem, "ui-selectmenu-text" );
+            // Add the flag from the data attribute in the selected element.
+            buttonItem.prepend( $( selectElement.element ).data( 'flag-html' ) );
+            buttonItem.children( 'img' ).addClass( 'ui-icon' );
+            return buttonItem;
+        }
+        /**
+         * Initialize a jQuery UI selectmenu widget on a DOM element
+         *
+         * @param {*} element - The jQuery object representing the DOM element to attach the widget with.
+         * @param {*} config  - All the parameters - options and callbacks - necessary to configure the jQuery UI selectmenu widget.
+         * @return {Object} - The jQuery UI selectmenu widget object instance.
+         */
+        function initializeSelectmenuWidget( element, config ) {
+            // Create the jQuery UI selectmenu widget for flags list dropdown and return its instance.
+            var selectmenuWidgetInstance = element.selectmenu( config ).selectmenu( 'instance' );
+            // Overrides each item in the jQuery UI selectmenu list by injecting flag image.
+            selectmenuWidgetInstance._renderItem = selectmenuRenderItem;
+            // Override the selected item rendering for jQuery UI 1.12
+            if ( isJqueryUImin112 ) {
+                selectmenuWidgetInstance._renderButtonItem = selectmenuRenderButtonItem;
+                // Need to refresh to take in account the new button item rendering method after the selectmenu widget instanciaion.
+                selectmenuWidgetInstance.refresh();
+            }
+            return selectmenuWidgetInstance
+        }
+        /**
+         *  Selectmenu widget common parameters for its configuration: options and callbacks.
+         */
+        // Selectmenu widget options
+        var selectmenuOptions = { width: defaultSelectmenuWidth };
+        // Selectmenu widget callbacks
+        var selectmenuFlagListCallbacks = {};
+        // Callbacks when Selectmenu widget create or select event is triggered.
+        var createSelectCallback = function( event, ui ) {
+            selectmenuRefreshButtonText( event.target );
+        }
+        /**
+         *  Overrides the flag dropdown list with our customized jquery ui selectmenu.
+         */
+        // Callbacks when Selectmenu widget change or open event is triggered.
+        // Needed to correctly refresh the selected element in the list when editing an existing language or when the value change is triggered by the language choice.
+        // jQuery UI 1.11 callback version.
+        var changeOpenCallback = function( event, ui ){
+            selectmenuRefreshButtonText( $( event.target ).selectmenu( 'refresh' ) );
+        }
+        // jQueryUI 1.12 callback version.
+        var changeOpenCallbackjQueryUI112 = function( event, ui ){
+            // Just a refresh of the menu is needed with jQuery UI 1.12 because _renderButtonItem is triggered and then inject correctly the flag.
+            $( event.target ).selectmenu( 'refresh' );
+        }
+        // There is no need of create and select callbacks with jQuery UI 1.12 because overriding _renderButtonItem method do the job.
+        if ( isJqueryUImin112 ) {
+            selectmenuFlagListCallbacks =
+                {
+                    change: changeOpenCallbackjQueryUI112,
+                    open: changeOpenCallbackjQueryUI112,
+                };
+        } else {
+            selectmenuFlagListCallbacks = {
+                create: createSelectCallback,
+                select: createSelectCallback,
+                change: changeOpenCallback,
+                open: changeOpenCallback,
+            };
+        }
+        // Create the selectmenu widget only if the field is present.
+        if ( flagListExist ) {
+            // Create the jQuery UI selectmenu widget for flags list dropdown and return its instance.
+            var selectmenuFlagList = initializeSelectmenuWidget( $( '#flag_list' ), Object.assign( {}, selectmenuOptions, selectmenuFlagListCallbacks ) );
+            $( '#lang_list' ).on(
+                'languageChanged',
+                function( event, flag ) {
+                    // Refresh the flag field
+                    selectmenuFlagList.element.val( flag );
+                    selectmenuFlagList._trigger( 'change' );
+                }
+            );
+        }
+        /**
+         * Language choice in predefined languages in Polylang Languages settings page and wizard.
+         * Overrides the predefined language dropdown list with our customized jQuery ui selectmenu widget.
+         */
+        /**
+         * Fill the other language form fields from the language element selected in the language list dropdown.
+         *
+         * @param {Object} language - language object of the selected element in the language list dropdown.
+         */
+        function fillLanguageFields( language ) {
+            $( '#lang_slug' ).val( language.slug );
+            $( '#lang_locale' ).val( language.locale );
+            $( 'input[name="rtl"]' ).val( language.rtl );
+            $( '#lang_name' ).val( language.name );
+        }
+        /**
+         * Parse selected language element in the language list dropdown.
+         *
+         * @param {object} event - jQuery triggered event.
+         * @return {object} The language object with its named properties.
+         */
+        function parseSelectedLanguage( event ) {
+            var selectedElement = $('option:selected', event.target);
+            var values = selectedElement.val().split(':')
+            return {
+                slug: values[0],
+                locale: values[1],
+                rtl: [values[2]],
+                flag: values[3],
+                name: selectedElement.text().split(' - ')[0] // At the moment there is no need of the 2nd part because it corresponds on the locale which is already known by splitting the selected element value
+            };
+        }
+        // Callback when selectmenu widget change event is triggered.
+        var changeCallback = function( event, ui ) {
+            var language = parseSelectedLanguage( event );
+            fillLanguageFields( language );
+            $( event.target ).trigger( 'languageChanged', language.flag );
+        };
+        // Create the jQuery UI selectmenu widget languages list dropdown and return its instance.
+        var selectmenuLangListCallbacks = {};
+        // For the wizard we need a 100% width. So we override the previous defined value of selectmenuOptions.
+        if( $( '#lang_list' ).closest( '.pll-wizard-content' ).length > 0 ) {
+            selectmenuOptions = Object.assign( selectmenuOptions, { width: wizardSelectmenuWidth } );
+        }
+        // There is no need of create and select callbacks with jQuery UI 1.12 because overrinding _renderButtonItem method do the job.
+        if ( isJqueryUImin112 ) {
+            selectmenuLangListCallbacks = {
+                change: changeCallback,
+            };
+        } else {
+            selectmenuLangListCallbacks = {
+                create: createSelectCallback,
+                select: createSelectCallback,
+                change: changeCallback,
+            };
+        }
+        if ( langListExist ) {
+            initializeSelectmenuWidget( $( '#lang_list' ), Object.assign( {}, selectmenuOptions, selectmenuLangListCallbacks ) );
+        }
         // strings translations
         // save translations when pressing enter
+        $( '.translation input' ).keypress(
+        $( '.translation input' ).on(
+            'keydown',
             function( event ){
                 if ( 13 === event.keyCode ) {
+                if ( 'Enter' === event.key ) {
                     event.preventDefault();
                     $( '#submit' ).click();
+                    $( '#submit' ).trigger( 'click' );
+                }
+            }
 …
         // act when pressing enter or esc in configurations
+        $( '.pll-configure' ).keypress(
+        $( '.pll-configure' ).on(
+            'keydown',
             function( event ){
                 if ( 13 === event.keyCode ) {
+                if ( 'Enter' === event.key ) {
                     event.preventDefault();
                     $( this ).find( '.save' ).click();
+                }
                 if ( 27 === event.keyCode ) {
+                    $( this ).find( '.save' ).trigger( 'click' );
+                }
+                if ( 'Escape' === event.key ) {
                     event.preventDefault();
                     $( this ).find( '.cancel' ).click();
+                    $( this ).find( '.cancel' ).trigger( 'click' );
+                }
+            }
 …
         // settings URL modifications
         // manages visibility of fields
+        $( "input[name='force_lang']" ).change(
+        $( "input[name='force_lang']" ).on(
+            'change',
             function() {
                 function pll_toggle( a, test ) {
 …
+    }
 );

polylang/trunk/js/admin.min.js

r2377116	r2424335
1		jQuery(document).ready(function(e){var t;e("table.languages").on({focusin:function(){clearTimeout(t),focusedRowActions=e(this).find(".row-actions"),e(".row-actions").not(this).removeClass("visible"),focusedRowActions.addClass("visible")},focusout:function(){t=setTimeout(function(){focusedRowActions.removeClass("visible")},30)}},"tr");var n=function(t,n){var s=e("<li>").text(n.label).prepend(e(n.element).data("flag-html"));return s.children("img").addClass("ui-icon"),s.appendTo(t)},s=function(t){var n=e(t).selectmenu("instance").buttonText;n.prepend(e(t).children(":selected").data("flag-html")),n.children("img").addClass("ui-icon")};e("#flag_list").on("selectmenucreate selectmenuselect",function(){s(this)}),e("#flag_list").on("selectmenuopen",function(){e(this).selectmenu("refresh").trigger("selectmenuselect")}),e("#flag_list").selectmenu({width:"100%"}),e("#flag_list").selectmenu("instance")._renderItem=n,e("#lang_list").on("selectmenucreate selectmenuselect",function(){s(this)}),e("#lang_list").selectmenu({width:"100%"}),e("#lang_list").selectmenu("instance")._renderItem=n,e("#add-lang #lang_list").on("selectmenuchange",function(){var t=e(this).val().split(":"),n=e("option:selected",this).text().split(" - ");e("#lang_slug").val(t[0]),e("#lang_locale").val(t[1]),e('input[name="rtl"]').val([t[2]]),e("#lang_name").val(n[0]),e("#flag_list").val(t[3]),e("#flag_list").selectmenu("refresh").trigger("selectmenuselect")}),e(".translation input").keypress(function(t){13===t.keyCode&&(t.preventDefault(),e("#submit").click())}),e("#the-list").on("click",".configure>a",function(){return e(".pll-configure").hide().prev().show(),e(this).closest("tr").hide().next().show(),!1}),e("#the-list").on("click",".cancel",function(){e(this).closest("tr").hide().prev().show()}),e("#the-list").on("click",".save",function(){var t=e(this).closest("tr"),n=t.attr("id").split("-"),s={action:"pll_save_options",pll_ajax_settings:!0,module:n[n.length-1],_pll_nonce:e("#_pll_nonce").val()};s=t.find(":input").serialize()+"&"+e.param(s),e.post(ajaxurl,s,function(n){var s=wpAjax.parseAjaxResponse(n,"ajax-response");e.each(s.responses,function(){switch(this.what){case"license-update":e("#pll-license-"+this.data).replaceWith(this.supplemental.html);break;case"success":t.hide().prev().show();case"error":e(".settings-error").remove(),e("h1").after(this.data),e(".notice.is-dismissible").each(function(){var t=e(this),n=e('<button type="button" class="notice-dismiss"><span class="screen-reader-text"></span></button>'),s=pll_dismiss_notice\|\|"";n.find(".screen-reader-text").text(s),t.append(n),n.on("click.wp-dismiss-notice",function(n){n.preventDefault(),t.fadeTo(100,0,function(){e(this).slideUp(100,function(){e(this).remove()})})})})}})})}),e(".pll-configure").keypress(function(t){13===t.keyCode&&(t.preventDefault(),e(this).find(".save").click()),27===t.keyCode&&(t.preventDefault(),e(this).find(".cancel").click())}),e("input[name='force_lang']").change(function(){function t(e,t){t?e.show():e.hide()}var n=e(this).val();t(e("#pll-domains-table"),3==n),t(e("#pll-hide-default"),3>n),t(e("#pll-rewrite"),2>n),t(e("#pll-redirect-lang"),2>n)}),e(".pll-deactivate-license").on("click",function(){var t={action:"pll_deactivate_license",pll_ajax_settings:!0,id:e(this).attr("id"),_pll_nonce:e("#_pll_nonce").val()};e.post(ajaxurl,t,function(t){e("#pll-license-"+t.id).replaceWith(t.html)})}),e(".if-js-closed").removeClass("if-js-closed").addClass("closed"),"undefined"!=typeof postboxes&&postboxes.add_postbox_toggles(pagenow)});
	1	jQuery((function($){var transitionTimeout;$("table.languages").on({focusin:function(){clearTimeout(transitionTimeout);var focusedRowActions=$(this).find(".row-actions");$(".row-actions").not(this).removeClass("visible"),focusedRowActions.addClass("visible")},focusout:function(){transitionTimeout=setTimeout((function(){focusedRowActions.removeClass("visible")}),30)}},"tr");var isJqueryUImin112=$.ui.version>="1.12.0",flagListExist=$("#flag_list").length,langListExist=$("#lang_list").length,defaultSelectmenuWidth="95%",wizardSelectmenuWidth="100%",selectmenuRenderItem=function(ul,item){var li=$("<li>"),wrapper=$("<div>");return item.disabled&&this._addClass(li,null,"ui-state-disabled"),this._setText(wrapper,item.label),wrapper.prepend($(item.element).data("flag-html")),wrapper.children("img").addClass("ui-icon"),li.append(wrapper).appendTo(ul)},selectmenuRefreshButtonText=function(selectElement){var buttonText=$(selectElement).selectmenu("instance").buttonText;buttonText.prepend($(selectElement).children(":selected").data("flag-html")),buttonText.children("img").addClass("ui-icon")},selectmenuRenderButtonItem=function(selectElement){var buttonItem=$("<span>");return this._setText(buttonItem,selectElement.label),this._addClass(buttonItem,"ui-selectmenu-text"),buttonItem.prepend($(selectElement.element).data("flag-html")),buttonItem.children("img").addClass("ui-icon"),buttonItem};function initializeSelectmenuWidget(element,config){var selectmenuWidgetInstance=element.selectmenu(config).selectmenu("instance");return selectmenuWidgetInstance._renderItem=selectmenuRenderItem,isJqueryUImin112&&(selectmenuWidgetInstance._renderButtonItem=selectmenuRenderButtonItem,selectmenuWidgetInstance.refresh()),selectmenuWidgetInstance}var selectmenuOptions={width:"95%"},selectmenuFlagListCallbacks={},createSelectCallback=function(event,ui){selectmenuRefreshButtonText(event.target)},changeOpenCallback=function(event,ui){selectmenuRefreshButtonText($(event.target).selectmenu("refresh"))},changeOpenCallbackjQueryUI112=function(event,ui){$(event.target).selectmenu("refresh")};if(selectmenuFlagListCallbacks=isJqueryUImin112?{change:changeOpenCallbackjQueryUI112,open:changeOpenCallbackjQueryUI112}:{create:createSelectCallback,select:createSelectCallback,change:changeOpenCallback,open:changeOpenCallback},flagListExist){var selectmenuFlagList=initializeSelectmenuWidget($("#flag_list"),Object.assign({},selectmenuOptions,selectmenuFlagListCallbacks));$("#lang_list").on("languageChanged",(function(event,flag){selectmenuFlagList.element.val(flag),selectmenuFlagList._trigger("change")}))}function fillLanguageFields(language){$("#lang_slug").val(language.slug),$("#lang_locale").val(language.locale),$('input[name="rtl"]').val(language.rtl),$("#lang_name").val(language.name)}function parseSelectedLanguage(event){var selectedElement=$("option:selected",event.target),values=selectedElement.val().split(":");return{slug:values[0],locale:values[1],rtl:[values[2]],flag:values[3],name:selectedElement.text().split(" - ")[0]}}var changeCallback=function(event,ui){var language=parseSelectedLanguage(event);fillLanguageFields(language),$(event.target).trigger("languageChanged",language.flag)},selectmenuLangListCallbacks={};$("#lang_list").closest(".pll-wizard-content").length>0&&(selectmenuOptions=Object.assign(selectmenuOptions,{width:"100%"})),selectmenuLangListCallbacks=isJqueryUImin112?{change:changeCallback}:{create:createSelectCallback,select:createSelectCallback,change:changeCallback},langListExist&&initializeSelectmenuWidget($("#lang_list"),Object.assign({},selectmenuOptions,selectmenuLangListCallbacks)),$(".translation input").on("keydown",(function(event){"Enter"===event.key&&(event.preventDefault(),$("#submit").trigger("click"))})),$("#the-list").on("click",".configure>a",(function(){return $(".pll-configure").hide().prev().show(),$(this).closest("tr").hide().next().show(),!1})),$("#the-list").on("click",".cancel",(function(){$(this).closest("tr").hide().prev().show()})),$("#the-list").on("click",".save",(function(){var tr=$(this).closest("tr"),parts=tr.attr("id").split("-"),data={action:"pll_save_options",pll_ajax_settings:!0,module:parts[parts.length-1],_pll_nonce:$("#_pll_nonce").val()};data=tr.find(":input").serialize()+"&"+$.param(data),$.post(ajaxurl,data,(function(response){var res=wpAjax.parseAjaxResponse(response,"ajax-response");$.each(res.responses,(function(){switch(this.what){case"license-update":$("#pll-license-"+this.data).replaceWith(this.supplemental.html);break;case"success":tr.hide().prev().show();case"error":$(".settings-error").remove(),$("h1").after(this.data),$(".notice.is-dismissible").each((function(){var $this=$(this),$button=$('<button type="button" class="notice-dismiss"><span class="screen-reader-text"></span></button>'),btnText=pll_dismiss_notice\|\|"";$button.find(".screen-reader-text").text(btnText),$this.append($button),$button.on("click.wp-dismiss-notice",(function(event){event.preventDefault(),$this.fadeTo(100,0,(function(){$(this).slideUp(100,(function(){$(this).remove()}))}))}))}))}}))}))})),$(".pll-configure").on("keydown",(function(event){"Enter"===event.key&&(event.preventDefault(),$(this).find(".save").trigger("click")),"Escape"===event.key&&(event.preventDefault(),$(this).find(".cancel").trigger("click"))})),$("input[name='force_lang']").on("change",(function(){function pll_toggle(a,test){test?a.show():a.hide()}var value=$(this).val();pll_toggle($("#pll-domains-table"),3==value),pll_toggle($("#pll-hide-default"),3>value),pll_toggle($("#pll-rewrite"),2>value),pll_toggle($("#pll-redirect-lang"),2>value)})),$(".pll-deactivate-license").on("click",(function(){var data={action:"pll_deactivate_license",pll_ajax_settings:!0,id:$(this).attr("id"),_pll_nonce:$("#_pll_nonce").val()};$.post(ajaxurl,data,(function(response){$("#pll-license-"+response.id).replaceWith(response.html)}))})),$(".if-js-closed").removeClass("if-js-closed").addClass("closed"),"undefined"!=typeof postboxes&&postboxes.add_postbox_toggles(pagenow)}));

polylang/trunk/js/block-editor.js

-                      r2340428
+                      r2424335
         // If options.url is defined, this is not a REST request but a direct call to post.php for legacy metaboxes.
         if ( 'undefined' === typeof options.url ) {
             if ( 'undefined' === typeof options.data ) {
+            if ( 'undefined' === typeof options.data || null === options.data ) {
                 // GET
                 options.path += ( ( options.path.indexOf( '?' ) >= 0 ) ? '&lang=' : '?lang=' ) + getCurrentLanguage();
 …
  * @since 2.5
  */
 jQuery( document ).ready(
+jQuery(
     function( $ ) {
         // savePost after changing the post's language and reload page for refreshing post translated data
+        $( '.post_lang_choice' ).change(
+        $( '.post_lang_choice' ).on(
+            'change',
             function() {
                 const select = wp.data.select;
 …
  * @since 1.5
  */
 jQuery( document ).ready(
+jQuery(
     function( $ ) {
         // Ajax for changing the post's language in the languages metabox
+        $( '.post_lang_choice' ).change(
+        $( '.post_lang_choice' ).on(
+            'change',
             function() {
                 var data = {
 …
                     // When the input box is emptied
+                    $( this ).blur(
+                    $( this ).on(
+                        'blur',
                         function() {
                             if ( ! $( this ).val() ) {

polylang/trunk/js/block-editor.min.js

r2349002	r2424335
1		function getCurrentLanguage(){return document.querySelector("[name=post_lang_choice]").value}wp.apiFetch.use(function(t,e){return void 0===t.url&&(void 0===t.data?t.path+=(t.path.indexOf("?")>=0?"&lang=":"?lang=")+getCurrentLanguage():t.data.lang=getCurrentLanguage()),e(t)}),jQuery(document).ready(function(t){t(".post_lang_choice").change(function(){const t=wp.data.select,e=wp.data.dispatch,n=wp.data.subscribe;let a=null;const o=new Promise(function(e,o){a=n(function(){const n=t("core/editor").didPostSaveRequestSucceed(),a=t("core/editor").didPostSaveRequestFail();(n\|\|a)&&(a?o():e())})});if(location.pathname.match(/post-new.php/gi)){const e=t("core/editor").getEditedPostAttribute("title"),n=t("core/editor").getEditedPostAttribute("content"),a=t("core/editor").getEditedPostAttribute("excerpt");""===e&&""===n&&""===a&&(-1!=location.search.indexOf("new_lang")?window.location.search=window.location.search.replace(/(?:new_lang=[^&])(&)?(.)/,"new_lang="+this.value+"$1$2"):window.location.search=window.location.search+(-1!=window.location.search.indexOf("?")?"&":"?")+"new_lang="+this.value)}e("core/editor").savePost(),o.then(function(){a(),window.location.reload()},function(){a()}).catch(function(){a()})})}),jQuery(document).ready(function(t){function e(){t(".tr_lang").each(function(){var e=t(this).attr("id").substring(8),n=t(this).parent().parent().siblings(".pll-edit-column");t(this).autocomplete({minLength:0,source:ajaxurl+"?action=pll_posts_not_translated&post_language="+t(".post_lang_choice").val()+"&translation_language="+e+"&post_type="+t("#post_type").val()+"&_pll_nonce="+t("#_pll_nonce").val(),select:function(a,o){t("#htr_lang_"+e).val(o.item.id),n.html(o.item.link)}}),t(this).blur(function(){t(this).val()\|\|(t("#htr_lang_"+e).val(0),n.html(n.siblings(".hidden").children().clone()))})})}t(".post_lang_choice").change(function(){var n={action:"post_lang_choice",lang:t(this).val(),post_type:t("#post_type").val(),post_id:t("#post_ID").val(),_pll_nonce:t("#_pll_nonce").val()};t.post(ajaxurl,n,function(n){var a=wpAjax.parseAjaxResponse(n,"ajax-response");t.each(a.responses,function(){switch(this.what){case"translations":t(".translations").html(this.data),e();break;case"flag":t(".pll-select-flag").html(this.data)}})})}),e()});
	1	function getCurrentLanguage(){return document.querySelector("[name=post_lang_choice]").value}wp.apiFetch.use((function(options,next){return void 0===options.url&&(void 0===options.data\|\|null===options.data?options.path+=(options.path.indexOf("?")>=0?"&lang=":"?lang=")+getCurrentLanguage():options.data.lang=getCurrentLanguage()),next(options)})),jQuery((function($){$(".post_lang_choice").on("change",(function(){const select=wp.data.select,dispatch=wp.data.dispatch,subscribe=wp.data.subscribe;let unsubscribe=null;const savePostIsDone=new Promise((function(resolve,reject){unsubscribe=subscribe((function(){const isSavePostSucceeded=select("core/editor").didPostSaveRequestSucceed(),isSavePostFailed=select("core/editor").didPostSaveRequestFail();(isSavePostSucceeded\|\|isSavePostFailed)&&(isSavePostFailed?reject():resolve())}))}));if(location.pathname.match(/post-new.php/gi)){const title=select("core/editor").getEditedPostAttribute("title"),content=select("core/editor").getEditedPostAttribute("content"),excerpt=select("core/editor").getEditedPostAttribute("excerpt");""===title&&""===content&&""===excerpt&&(-1!=location.search.indexOf("new_lang")?window.location.search=window.location.search.replace(/(?:new_lang=[^&])(&)?(.)/,"new_lang="+this.value+"$1$2"):window.location.search=window.location.search+(-1!=window.location.search.indexOf("?")?"&":"?")+"new_lang="+this.value)}dispatch("core/editor").savePost(),savePostIsDone.then((function(){unsubscribe(),window.location.reload()}),(function(){unsubscribe()})).catch((function(){unsubscribe()}))}))})),jQuery((function($){function init_translations(){$(".tr_lang").each((function(){var tr_lang=$(this).attr("id").substring(8),td=$(this).parent().parent().siblings(".pll-edit-column");$(this).autocomplete({minLength:0,source:ajaxurl+"?action=pll_posts_not_translated&post_language="+$(".post_lang_choice").val()+"&translation_language="+tr_lang+"&post_type="+$("#post_type").val()+"&_pll_nonce="+$("#_pll_nonce").val(),select:function(event,ui){$("#htr_lang_"+tr_lang).val(ui.item.id),td.html(ui.item.link)}}),$(this).on("blur",(function(){$(this).val()\|\|($("#htr_lang_"+tr_lang).val(0),td.html(td.siblings(".hidden").children().clone()))}))}))}$(".post_lang_choice").on("change",(function(){var data={action:"post_lang_choice",lang:$(this).val(),post_type:$("#post_type").val(),post_id:$("#post_ID").val(),_pll_nonce:$("#_pll_nonce").val()};$.post(ajaxurl,data,(function(response){var res=wpAjax.parseAjaxResponse(response,"ajax-response");$.each(res.responses,(function(){switch(this.what){case"translations":$(".translations").html(this.data),init_translations();break;case"flag":$(".pll-select-flag").html(this.data)}}))}))})),init_translations()}));

polylang/trunk/js/classic-editor.js

-                      r2377116
+                      r2424335
 // tag suggest in metabox
+(function( $ ){
+    $.ajaxPrefilter(
+        function( options, originalOptions, jqXHR ) {
+            if ( 'string' === typeof options.data && -1 !== options.url.indexOf( 'action=ajax-tag-search' ) && ( lang = $( '.post_lang_choice' ).val() ) ) {
+                options.data = 'lang=' + lang + '&' + options.data;
+            }
+        }
+    );
+})( jQuery );
+// overrides tagBox.get
+(function( $ ){
+    // overrides function to add the language
+    tagBox.get = function( id ) {
+        var tax = id.substr( id.indexOf( '-' ) + 1 );
+        // add the language in the $_POST variable
+        var data = {
+            action: 'get-tagcloud',
+            lang:   $( '.post_lang_choice' ).val(),
+            tax:    tax
+        }
+        $.post(
+            ajaxurl,
+            data,
+            function( r, stat ) {
+                if ( 0 == r || 'success' != stat ) {
+                    r = wpAjax.broken;
+                }
+                // @see code from WordPress core https://github.com/WordPress/WordPress/blob/5.2.2/wp-admin/js/tags-box.js#L291
+                // @see wp_generate_tag_cloud function which generate the escaped HTML https://github.com/WordPress/WordPress/blob/a02b5cc2a8eecb8e076fbb7cf4de7bd2ec8a8eb1/wp-includes/category-template.php#L966-L975
+                r = $( '<div />' ).addClass( 'the-tagcloud' ).attr( 'id', 'tagcloud-' + tax ).html( r ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.html
+                $( 'a', r ).click(
+                    function(){
+                        tagBox.flushTags( $( this ).closest( '.inside' ).children( '.tagsdiv' ), this );
+                        return false;
+                    }
+                );
+                // add an if else condition to allow modifying the tags outputed when switching the language
+                if ( v = $( '#tagcloud-' + tax ).css( 'display' ) ) {
+                    // See the comment above when r variable is created.
+                    $( '#tagcloud-' + tax ).replaceWith( r ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.replaceWith
+                    $( '#tagcloud-' + tax ).css( 'display', v );
+                }
+                else {
+                    // See the comment above when r variable is created.
+                    $( '#' + id ).after( r ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.after
+jQuery(
+    function( $ ) {
+        $.ajaxPrefilter(
+            function( options, originalOptions, jqXHR ) {
+                var lang = $( '.post_lang_choice' ).val();
+                if ( 'string' === typeof options.data && -1 !== options.url.indexOf( 'action=ajax-tag-search' ) && lang ) {
+                    options.data = 'lang=' + lang + '&' + options.data;
+                }
+            }
         );
+    }
+})( jQuery );
+jQuery( document ).ready(
+);
+// overrides tagBox.get
+jQuery(
     function( $ ) {
+        // overrides function to add the language
+        tagBox.get = function( id ) {
+            var tax = id.substr( id.indexOf( '-' ) + 1 );
+            // add the language in the $_POST variable
+            var data = {
+                action: 'get-tagcloud',
+                lang:   $( '.post_lang_choice' ).val(),
+                tax:    tax
+            }
+            $.post(
+                ajaxurl,
+                data,
+                function( r, stat ) {
+                    if ( 0 == r || 'success' != stat ) {
+                        r = wpAjax.broken;
+                    }
+                    // @see code from WordPress core https://github.com/WordPress/WordPress/blob/5.2.2/wp-admin/js/tags-box.js#L291
+                    // @see wp_generate_tag_cloud function which generate the escaped HTML https://github.com/WordPress/WordPress/blob/a02b5cc2a8eecb8e076fbb7cf4de7bd2ec8a8eb1/wp-includes/category-template.php#L966-L975
+                    r = $( '<div />' ).addClass( 'the-tagcloud' ).attr( 'id', 'tagcloud-' + tax ).html( r ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.html
+                    $( 'a', r ).click(
+                        function(){
+                            tagBox.flushTags( $( this ).closest( '.inside' ).children( '.tagsdiv' ), this );
+                            return false;
+                        }
+                    );
+                    var tagCloud = $( '#tagcloud-' + tax );
+                    // add an if else condition to allow modifying the tags outputed when switching the language
+                    var v = tagCloud.css( 'display' );
+                    if ( v ) {
+                        // See the comment above when r variable is created.
+                        $( '#tagcloud-' + tax ).replaceWith( r ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.replaceWith
+                        $( '#tagcloud-' + tax ).css( 'display', v );
+                    }
+                    else {
+                        // See the comment above when r variable is created.
+                        $( '#' + id ).after( r ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.after
+                    }
+                }
+            );
+        }
+    }
+);
+jQuery(
+    function ( $ ) {
         // collect taxonomies - code partly copied from WordPress
         var taxonomies = new Array();
 …
                     // when the input box is emptied
+                    $( this ).blur(
+                    $( this ).on(
+                        'blur',
                         function() {
                             if ( ! $( this ).val() ) {

polylang/trunk/js/classic-editor.min.js

r2368444	r2424335
1		!function(t){t.ajaxPrefilter(function(a,l,n){"string"==typeof a.data&&-1!==a.url.indexOf("action=ajax-tag-search")&&(lang=t(".post_lang_choice").val())&&(a.data="lang="+lang+"&"+a.data)})}(jQuery),function(t){tagBox.get=function(a){var l=a.substr(a.indexOf("-")+1),n={action:"get-tagcloud",lang:t(".post_lang_choice").val(),tax:l};t.post(ajaxurl,n,function(n,e){0!=n&&"success"==e\|\|(n=wpAjax.broken),n=t("<div />").addClass("the-tagcloud").attr("id","tagcloud-"+l).html(n),t("a",n).click(function(){return tagBox.flushTags(t(this).closest(".inside").children(".tagsdiv"),this),!1}),(v=t("#tagcloud-"+l).css("display"))?(t("#tagcloud-"+l).replaceWith(n),t("#tagcloud-"+l).css("display",v)):t("#"+a).after(n)})}}(jQuery),jQuery(document).ready(function(t){var a=new Array;function l(){t(".tr_lang").each(function(){var a=t(this).attr("id").substring(8),l=t(this).parent().parent().siblings(".pll-edit-column");t(this).autocomplete({minLength:0,source:ajaxurl+"?action=pll_posts_not_translated&post_language="+t(".post_lang_choice").val()+"&translation_language="+a+"&post_type="+t("#post_type").val()+"&_pll_nonce="+t("#_pll_nonce").val(),select:function(n,e){t("#htr_lang_"+a).val(e.item.id),l.html(e.item.link)}}),t(this).blur(function(){t(this).val()\|\|(t("#htr_lang_"+a).val(0),l.html(l.siblings(".hidden").children().clone()))})})}t(".categorydiv").each(function(){var l,n;(l=t(this).attr("id").split("-")).shift(),n=l.join("-"),a.push(n),t("#"+n+"-add-submit").before(t("<input />").attr("type","hidden").attr("id",n+"-lang").attr("name","term_lang_choice").attr("value",t(".post_lang_choice").val()))}),t(".post_lang_choice").change(function(){var n=t(this).val(),e=t(this).children('option[value="'+n+'"]').attr("lang"),i=t('.pll-translation-column > span[lang="'+e+'"]').attr("dir"),s={action:"post_lang_choice",lang:n,post_type:t("#post_type").val(),taxonomies:a,post_id:t("#post_ID").val(),_pll_nonce:t("#_pll_nonce").val()};t.post(ajaxurl,s,function(a){var n=wpAjax.parseAjaxResponse(a,"ajax-response");t.each(n.responses,function(){switch(this.what){case"translations":t(".translations").html(this.data),l();break;case"taxonomy":var a=this.data;t("#"+a+"checklist").html(this.supplemental.all),t("#"+a+"checklist-pop").html(this.supplemental.populars),t("#new"+a+"_parent").replaceWith(this.supplemental.dropdown),t("#"+a+"-lang").val(t(".post_lang_choice").val());break;case"pages":t("#parent_id").html(this.data);break;case"flag":t(".pll-select-flag").html(this.data);break;case"permalink":var n=t("#edit-slug-box");"-1"!=this.data&&n.children().length&&n.html(this.data)}}),t(".tagcloud-link").each(function(){var a=t(this).attr("id");tagBox.get(a)}),t("body").removeClass("pll-dir-rtl").removeClass("pll-dir-ltr").addClass("pll-dir-"+i),t("#content_ifr").contents().find("html").attr("lang",e).attr("dir",i),t("#content_ifr").contents().find("body").attr("dir",i)})}),l()});
	1	jQuery(function(t){t.ajaxPrefilter(function(a,l,n){var e=t(".post_lang_choice").val();"string"==typeof a.data&&-1!==a.url.indexOf("action=ajax-tag-search")&&e&&(a.data="lang="+e+"&"+a.data)})}),jQuery(function(t){tagBox.get=function(a){var l=a.substr(a.indexOf("-")+1),n={action:"get-tagcloud",lang:t(".post_lang_choice").val(),tax:l};t.post(ajaxurl,n,function(n,e){0!=n&&"success"==e\|\|(n=wpAjax.broken),n=t("<div />").addClass("the-tagcloud").attr("id","tagcloud-"+l).html(n),t("a",n).click(function(){return tagBox.flushTags(t(this).closest(".inside").children(".tagsdiv"),this),!1});var i=t("#tagcloud-"+l).css("display");i?(t("#tagcloud-"+l).replaceWith(n),t("#tagcloud-"+l).css("display",i)):t("#"+a).after(n)})}}),jQuery(function(t){var a=new Array;function l(){t(".tr_lang").each(function(){var a=t(this).attr("id").substring(8),l=t(this).parent().parent().siblings(".pll-edit-column");t(this).autocomplete({minLength:0,source:ajaxurl+"?action=pll_posts_not_translated&post_language="+t(".post_lang_choice").val()+"&translation_language="+a+"&post_type="+t("#post_type").val()+"&_pll_nonce="+t("#_pll_nonce").val(),select:function(n,e){t("#htr_lang_"+a).val(e.item.id),l.html(e.item.link)}}),t(this).on("blur",function(){t(this).val()\|\|(t("#htr_lang_"+a).val(0),l.html(l.siblings(".hidden").children().clone()))})})}t(".categorydiv").each(function(){var l,n;(l=t(this).attr("id").split("-")).shift(),n=l.join("-"),a.push(n),t("#"+n+"-add-submit").before(t("<input />").attr("type","hidden").attr("id",n+"-lang").attr("name","term_lang_choice").attr("value",t(".post_lang_choice").val()))}),t(".post_lang_choice").change(function(){var n=t(this).val(),e=t(this).children('option[value="'+n+'"]').attr("lang"),i=t('.pll-translation-column > span[lang="'+e+'"]').attr("dir"),s={action:"post_lang_choice",lang:n,post_type:t("#post_type").val(),taxonomies:a,post_id:t("#post_ID").val(),_pll_nonce:t("#_pll_nonce").val()};t.post(ajaxurl,s,function(a){var n=wpAjax.parseAjaxResponse(a,"ajax-response");t.each(n.responses,function(){switch(this.what){case"translations":t(".translations").html(this.data),l();break;case"taxonomy":var a=this.data;t("#"+a+"checklist").html(this.supplemental.all),t("#"+a+"checklist-pop").html(this.supplemental.populars),t("#new"+a+"_parent").replaceWith(this.supplemental.dropdown),t("#"+a+"-lang").val(t(".post_lang_choice").val());break;case"pages":t("#parent_id").html(this.data);break;case"flag":t(".pll-select-flag").html(this.data);break;case"permalink":var n=t("#edit-slug-box");"-1"!=this.data&&n.children().length&&n.html(this.data)}}),t(".tagcloud-link").each(function(){var a=t(this).attr("id");tagBox.get(a)}),t("body").removeClass("pll-dir-rtl").removeClass("pll-dir-ltr").addClass("pll-dir-"+i),t("#content_ifr").contents().find("html").attr("lang",e).attr("dir",i),t("#content_ifr").contents().find("body").attr("dir",i)})}),l()});

polylang/trunk/js/post.js

-                      r2377116
+                      r2424335
  * Tag suggest in quick edit
  */
+(function( $ ){
+    $.ajaxPrefilter(
+        function( options, originalOptions, jqXHR ) {
+            if ( 'string' === typeof options.data && -1 !== options.data.indexOf( 'action=ajax-tag-search' ) && ( lang = $( ':input[name="inline_lang_choice"]' ).val() ) ) {
+                options.data = 'lang=' + lang + '&' + options.data;
+jQuery(
+    function( $ ) {
+        $.ajaxPrefilter(
+            function( options, originalOptions, jqXHR ) {
+                if ( 'string' === typeof options.data && -1 !== options.data.indexOf( 'action=ajax-tag-search' ) && ( lang = $( ':input[name="inline_lang_choice"]' ).val() ) ) {
+                    options.data = 'lang=' + lang + '&' + options.data;
+                }
+            }
+        }
     );
 })( jQuery );
+        );
+    }
+);
 /**
  * Quick edit
  */
+(function( $ ) {
+    $( document ).bind(
+        'DOMNodeInserted',
+        function( e ) {
+            var t = $( e.target );
+jQuery(
+    function( $ ) {
+        $( document ).on(
+            'DOMNodeInserted',
+            function( e ) {
+                var t = $( e.target );
             // WP inserts the quick edit from
             if ( 'inline-edit' == t.attr( 'id' ) ) {
                 var post_id = t.prev().attr( 'id' ).replace( "post-", "" );
+                // WP inserts the quick edit from
+                if ( 'inline-edit' == t.attr( 'id' ) ) {
+                    var post_id = t.prev().attr( 'id' ).replace( "post-", "" );
                 if ( post_id > 0 ) {
                     // language dropdown
                     var select = t.find( ':input[name="inline_lang_choice"]' );
                     var lang = $( '#lang_' + post_id ).html();
                     select.val( lang ); // populates the dropdown
+                    if ( post_id > 0 ) {
+                        // language dropdown
+                        var select = t.find( ':input[name="inline_lang_choice"]' );
+                        var lang = $( '#lang_' + post_id ).html();
+                        select.val( lang ); // populates the dropdown
                     filter_terms( lang ); // initial filter for category checklist
                     filter_pages( lang ); // initial filter for parent dropdown
+                        filter_terms( lang ); // initial filter for category checklist
+                        filter_pages( lang ); // initial filter for parent dropdown
+                    // modify category checklist an parent dropdown on language change
+                    select.change(
+                        function() {
+                            filter_terms( $( this ).val() );
+                            filter_pages( $( this ).val() );
+                        }
+                    );
+                        // modify category checklist an parent dropdown on language change
+                        select.change(
+                            function() {
+                                filter_terms( $( this ).val() );
+                                filter_pages( $( this ).val() );
+                            }
+                        );
+                    }
+                }
+                /**
+                 * Filters the category checklist.
+                 */
+                function filter_terms( lang ) {
+                    if ( "undefined" != typeof( pll_term_languages ) ) {
+                        $.each(
+                            pll_term_languages,
+                            function( lg, term_tax ) {
+                                $.each(
+                                    term_tax,
+                                    function( tax, terms ) {
+                                        $.each(
+                                            terms,
+                                            function( i ) {
+                                                id = '#' + tax + '-' + pll_term_languages[ lg ][ tax ][ i ];
+                                                lang == lg ? $( id ).show() : $( id ).hide();
+                                            }
+                                        );
+                                    }
+                                );
+                            }
+                        );
+                    }
+                }
+                /**
+                 * Filters the parent page dropdown list.
+                 */
+                function filter_pages( lang ) {
+                    if ( "undefined" != typeof( pll_page_languages ) ) {
+                        $.each(
+                            pll_page_languages,
+                            function( lg, pages ) {
+                                $.each(
+                                    pages,
+                                    function( i ) {
+                                        v = $( '#post_parent option[value="' + pll_page_languages[ lg ][ i ] + '"]' );
+                                        lang == lg ? v.show() : v.hide();
+                                    }
+                                );
+                            }
+                        );
+                    }
+                }
+            }
+            // filter category checklist
+            function filter_terms( lang ) {
+                if ( "undefined" != typeof( pll_term_languages ) ) {
+                    $.each(
+                        pll_term_languages,
+                        function( lg, term_tax ) {
+                            $.each(
+                                term_tax,
+                                function( tax, terms ) {
+                                    $.each(
+                                        terms,
+                                        function( i ) {
+                                            id = '#' + tax + '-' + pll_term_languages[ lg ][ tax ][ i ];
+                                            lang == lg ? $( id ).show() : $( id ).hide();
+                                        }
+                                    );
+                                }
+                            );
+                        }
+                    );
+                }
+            }
+            // filter parent page dropdown list
+            function filter_pages( lang ) {
+                if ( "undefined" != typeof( pll_page_languages ) ) {
+                    $.each(
+                        pll_page_languages,
+                        function( lg, pages ) {
+                            $.each(
+                                pages,
+                                function( i ) {
+                                    v = $( '#post_parent option[value="' + pll_page_languages[ lg ][ i ] + '"]' );
+                                    lang == lg ? v.show() : v.hide();
+                                }
+                            );
+                        }
+                    );
+                }
+            }
+        }
+    );
+})( jQuery );
+        );
+    }
+);
 /**
 …
  * Acts on ajaxSuccess event
  */
+(function( $ ) {
+    $( document ).ajaxSuccess(
+        function( event, xhr, settings ) {
+            function update_rows( post_id ) {
+                // collect old translations
+                var translations = new Array();
+                $( '.translation_' + post_id ).each(
+                    function() {
+                        translations.push( $( this ).parent().parent().attr( 'id' ).substring( 5 ) );
+jQuery(
+    function( $ ) {
+        $( document ).ajaxSuccess(
+            function( event, xhr, settings ) {
+                function update_rows( post_id ) {
+                    // collect old translations
+                    var translations = new Array();
+                    $( '.translation_' + post_id ).each(
+                        function() {
+                            translations.push( $( this ).parent().parent().attr( 'id' ).substring( 5 ) );
+                        }
+                    );
+                    var data = {
+                        action:       'pll_update_post_rows',
+                        post_id:      post_id,
+                        translations: translations.join( ',' ),
+                        post_type:    $( "input[name='post_type']" ).val(),
+                        screen:       $( "input[name='screen']" ).val(),
+                        _pll_nonce:   $( "input[name='_inline_edit']" ).val() // reuse quick edit nonce
+                    };
+                    // get the modified rows in ajax and update them
+                    $.post(
+                        ajaxurl,
+                        data,
+                        function( response ) {
+                            if ( response ) {
+                                var res = wpAjax.parseAjaxResponse( response, 'ajax-response' );
+                                $.each(
+                                    res.responses,
+                                    function() {
+                                        if ( 'row' == this.what ) {
+                                            // data is built with a call to WP_Posts_List_Table::single_row method
+                                            // which uses internally other WordPress methods which escape correctly values.
+                                            // For Polylang language columns the HTML code is correctly escaped in PLL_Admin_Filters_Columns::post_column method.
+                                            $( "#post-" + this.supplemental.post_id ).replaceWith( this.data ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.replaceWith
+                                        }
+                                    }
+                                );
+                            }
+                        }
+                    );
+                }
+                if ( 'string' == typeof( settings.data ) ) { // Need to check the type due to block editor sometime sending FormData objects
+                    var data = wpAjax.unserialize( settings.data ); // what were the data sent by the ajax request?
+                    if ( 'undefined' != typeof( data['action'] ) && 'inline-save' == data['action'] ) {
+                        update_rows( data['post_ID'] );
+                    }
-                );
-                var data = {
-                    action:       'pll_update_post_rows',
-                    post_id:      post_id,
-                    translations: translations.join( ',' ),
-                    post_type:    $( "input[name='post_type']" ).val(),
-                    screen:       $( "input[name='screen']" ).val(),
-                    _pll_nonce:   $( "input[name='_inline_edit']" ).val() // reuse quick edit nonce
-                };
-                // get the modified rows in ajax and update them
-                $.post(
-                    ajaxurl,
-                    data,
-                    function( response ) {
-                        if ( response ) {
-                            var res = wpAjax.parseAjaxResponse( response, 'ajax-response' );
-                            $.each(
-                                res.responses,
-                                function() {
-                                    if ( 'row' == this.what ) {
-                                        // data is built with a call to WP_Posts_List_Table::single_row method
-                                        // which uses internally other WordPress methods which escape correctly values.
-                                        // For Polylang language columns the HTML code is correctly escaped in PLL_Admin_Filters_Columns::post_column method.
-                                        $( "#post-" + this.supplemental.post_id ).replaceWith( this.data ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.replaceWith
+                                    }
+                                }
-                            );
+                        }
+                    }
-                );
+            }
-            if ( 'string' == typeof( settings.data ) ) { // Need to check the type due to block editor sometime sending FormData objects
-                var data = wpAjax.unserialize( settings.data ); // what were the data sent by the ajax request?
-                if ( 'undefined' != typeof( data['action'] ) && 'inline-save' == data['action'] ) {
-                    update_rows( data['post_ID'] );
+                }
+            }
+        }
     );
 })( jQuery );
+        );
+    }
+);
 /**
 …
  * When clicking on attach link, filters find post list per media language
  */
+(function( $ ){
+    $.ajaxPrefilter(
+        function ( options, originalOptions, jqXHR ) {
+            if ( 'string' === typeof options.data && -1 !== options.data.indexOf( 'action=find_posts' ) ) {
+                options.data = 'pll_post_id=' + $( '#affected' ).val() + '&' + options.data;
+jQuery(
+    function( $ ) {
+        $.ajaxPrefilter(
+            function ( options, originalOptions, jqXHR ) {
+                if ( 'string' === typeof options.data && -1 !== options.data.indexOf( 'action=find_posts' ) ) {
+                    options.data = 'pll_post_id=' + $( '#affected' ).val() + '&' + options.data;
+                }
+            }
+        }
     );
 })( jQuery );
+        );
+    }
+);

polylang/trunk/js/post.min.js

r2349002	r2424335
1		!function(a){a.ajaxPrefilter(function(n,t,e){"string"==typeof n.data&&-1!==n.data.indexOf("action=ajax-tag-search")&&(lang=a(':input[name="inline_lang_choice"]').val())&&(n.data="lang="+lang+"&"+n.data)})}(jQuery),function(a){a(document).bind("DOMNodeInserted",function(n){var t=a(n.target);if("inline-edit"==t.attr("id")){var e=t.prev().attr("id").replace("post-","");if(e>0){var i=t.find(':input[name="inline_lang_choice"]'),o=a("#lang_"+e).html();i.val(o),l(o),s(o),i.change(function(){l(a(this).val()),s(a(this).val())})}}function l(n){"undefined"!=typeof pll_term_languages&&a.each(pll_term_languages,function(t,e){a.each(e,function(e,i){a.each(i,function(i){id="#"+e+"-"+pll_term_languages[t][e][i],n==t?a(id).show():a(id).hide()})})})}function s(n){"undefined"!=typeof pll_page_languages&&a.each(pll_page_languages,function(t,e){a.each(e,function(e){v=a('#post_parent option[value="'+pll_page_languages[t][e]+'"]'),n==t?v.show():v.hide()})})}})}(jQuery),function(a){a(document).ajaxSuccess(function(n,t,e){if("string"==typeof e.data){var i=wpAjax.unserialize(e.data);void 0!==i.action&&"inline-save"==i.action&&function(n){var t=new Array;a(".translation_"+n).each(function(){t.push(a(this).parent().parent().attr("id").substring(5))});var e={action:"pll_update_post_rows",post_id:n,translations:t.join(","),post_type:a("input[name='post_type']").val(),screen:a("input[name='screen']").val(),_pll_nonce:a("input[name='_inline_edit']").val()};a.post(ajaxurl,e,function(n){if(n){var t=wpAjax.parseAjaxResponse(n,"ajax-response");a.each(t.responses,function(){"row"==this.what&&a("#post-"+this.supplemental.post_id).replaceWith(this.data)})}})}(i.post_ID)}})}(jQuery),function(a){a.ajaxPrefilter(function(n,t,e){"string"==typeof n.data&&-1!==n.data.indexOf("action=find_posts")&&(n.data="pll_post_id="+a("#affected").val()+"&"+n.data)})}(jQuery);
	1	jQuery(function(a){a.ajaxPrefilter(function(n,t,e){"string"==typeof n.data&&-1!==n.data.indexOf("action=ajax-tag-search")&&(lang=a(':input[name="inline_lang_choice"]').val())&&(n.data="lang="+lang+"&"+n.data)})}),jQuery(function(a){a(document).on("DOMNodeInserted",function(n){var t=a(n.target);if("inline-edit"==t.attr("id")){var e=t.prev().attr("id").replace("post-","");if(e>0){var i=t.find(':input[name="inline_lang_choice"]'),o=a("#lang_"+e).html();i.val(o),l(o),s(o),i.change(function(){l(a(this).val()),s(a(this).val())})}}function l(n){"undefined"!=typeof pll_term_languages&&a.each(pll_term_languages,function(t,e){a.each(e,function(e,i){a.each(i,function(i){id="#"+e+"-"+pll_term_languages[t][e][i],n==t?a(id).show():a(id).hide()})})})}function s(n){"undefined"!=typeof pll_page_languages&&a.each(pll_page_languages,function(t,e){a.each(e,function(e){v=a('#post_parent option[value="'+pll_page_languages[t][e]+'"]'),n==t?v.show():v.hide()})})}})}),jQuery(function(a){a(document).ajaxSuccess(function(n,t,e){if("string"==typeof e.data){var i=wpAjax.unserialize(e.data);void 0!==i.action&&"inline-save"==i.action&&function(n){var t=new Array;a(".translation_"+n).each(function(){t.push(a(this).parent().parent().attr("id").substring(5))});var e={action:"pll_update_post_rows",post_id:n,translations:t.join(","),post_type:a("input[name='post_type']").val(),screen:a("input[name='screen']").val(),_pll_nonce:a("input[name='_inline_edit']").val()};a.post(ajaxurl,e,function(n){if(n){var t=wpAjax.parseAjaxResponse(n,"ajax-response");a.each(t.responses,function(){"row"==this.what&&a("#post-"+this.supplemental.post_id).replaceWith(this.data)})}})}(i.post_ID)}})}),jQuery(function(a){a.ajaxPrefilter(function(n,t,e){"string"==typeof n.data&&-1!==n.data.indexOf("action=find_posts")&&(n.data="pll_post_id="+a("#affected").val()+"&"+n.data)})});

polylang/trunk/js/term.js

-                      r2377116
+                      r2424335
  */
+// quick edit
+(function( $ ) {
+    $( document ).bind(
+        'DOMNodeInserted',
+        function( e ) {
+            var t = $( e.target );
+            // WP inserts the quick edit from
+            if ( 'inline-edit' == t.attr( 'id' ) ) {
+                var term_id = t.prev().attr( 'id' ).replace( "tag-", "" );
+                if ( term_id > 0 ) {
+                    // language dropdown
+                    var select = t.find( ':input[name="inline_lang_choice"]' );
+                    var lang = $( '#lang_' + term_id ).html();
+                    select.val( lang ); // populates the dropdown
+                    // disable the language dropdown for default categories
+                    var default_cat = $( '#default_cat_' + term_id ).html();
+                    if ( term_id == default_cat ) {
+                        select.prop( 'disabled', true );
+/**
+ * Quick edit
+ */
+jQuery(
+    function( $ ) {
+        $( document ).on(
+            'DOMNodeInserted',
+            function( e ) {
+                var t = $( e.target );
+                // WP inserts the quick edit from
+                if ( 'inline-edit' == t.attr( 'id' ) ) {
+                    var term_id = t.prev().attr( 'id' ).replace( "tag-", "" );
+                    if ( term_id > 0 ) {
+                        // language dropdown
+                        var select = t.find( ':input[name="inline_lang_choice"]' );
+                        var lang = $( '#lang_' + term_id ).html();
+                        select.val( lang ); // populates the dropdown
+                        // disable the language dropdown for default categories
+                        var default_cat = $( '#default_cat_' + term_id ).html();
+                        if ( term_id == default_cat ) {
+                            select.prop( 'disabled', true );
+                        }
+                    }
+                }
+            }
+        }
+    );
+})( jQuery );
+// update rows of translated terms when adding / deleting a translation or when the language is modified in quick edit
+// acts on ajaxSuccess event
+(function( $ ) {
+    $( document ).ajaxSuccess(
+        function( event, xhr, settings ) {
+            function update_rows( term_id ) {
+                // collect old translations
+                var translations = new Array();
+                $( '.translation_' + term_id ).each(
+                    function() {
+                        translations.push( $( this ).parent().parent().attr( 'id' ).substring( 4 ) );
+                    }
+                );
+                var data = {
+                    action:       'pll_update_term_rows',
+                    term_id:      term_id,
+                    translations: translations.join( ',' ),
+                    taxonomy:     $( "input[name='taxonomy']" ).val(),
+                    post_type:    $( "input[name='post_type']" ).val(),
+                    screen:       $( "input[name='screen']" ).val(),
+                    _pll_nonce:   $( '#_pll_nonce' ).val()
+                };
+                // get the modified rows in ajax and update them
+                $.post(
+                    ajaxurl,
+                    data,
+                    function( response ) {
+                        if ( response ) {
+                            var res = wpAjax.parseAjaxResponse( response, 'ajax-response' );
+        );
+    }
+);
+/**
+ * Update rows of translated terms when adding / deleting a translation or when the language is modified in quick edit.
+ * Acts on ajaxSuccess event.
+ */
+jQuery(
+    function( $ ) {
+        $( document ).ajaxSuccess(
+            function( event, xhr, settings ) {
+                function update_rows( term_id ) {
+                    // collect old translations
+                    var translations = new Array();
+                    $( '.translation_' + term_id ).each(
+                        function() {
+                            translations.push( $( this ).parent().parent().attr( 'id' ).substring( 4 ) );
+                        }
+                    );
+                    var data = {
+                        action:       'pll_update_term_rows',
+                        term_id:      term_id,
+                        translations: translations.join( ',' ),
+                        taxonomy:     $( "input[name='taxonomy']" ).val(),
+                        post_type:    $( "input[name='post_type']" ).val(),
+                        screen:       $( "input[name='screen']" ).val(),
+                        _pll_nonce:   $( '#_pll_nonce' ).val()
+                    };
+                    // get the modified rows in ajax and update them
+                    $.post(
+                        ajaxurl,
+                        data,
+                        function( response ) {
+                            if ( response ) {
+                                var res = wpAjax.parseAjaxResponse( response, 'ajax-response' );
+                                $.each(
+                                    res.responses,
+                                    function() {
+                                        if ( 'row' == this.what ) {
+                                            // data is built with a call to WP_Terms_List_Table::single_row method
+                                            // which uses internally other WordPress methods which escape correctly values.
+                                            // For Polylang language columns the HTML code is correctly escaped in PLL_Admin_Filters_Columns::term_column method.
+                                            $( "#tag-" + this.supplemental.term_id ).replaceWith( this.data ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.replaceWith
+                                        }
+                                    }
+                                );
+                            }
+                        }
+                    );
+                }
+                var data = wpAjax.unserialize( settings.data ); // what were the data sent by the ajax request?
+                if ( 'undefined' != typeof( data['action'] ) ) {
+                    switch ( data['action'] ) {
+                        // when adding a term, the new term_id is in the ajax response
+                        case 'add-tag':
+                            res = wpAjax.parseAjaxResponse( xhr.responseXML, 'ajax-response' );
                             $.each(
                                 res.responses,
                                 function() {
+                                    if ( 'row' == this.what ) {
+                                        // data is built with a call to WP_Terms_List_Table::single_row method
+                                        // which uses internally other WordPress methods which escape correctly values.
+                                        // For Polylang language columns the HTML code is correctly escaped in PLL_Admin_Filters_Columns::term_column method.
+                                        $( "#tag-" + this.supplemental.term_id ).replaceWith( this.data ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.replaceWith
+                                    if ( 'term' == this.what ) {
+                                        update_rows( this.supplemental.term_id );
+                                    }
+                                }
                             );
+                        }
+                            // and also reset translations hidden input fields
+                            $( '.htr_lang' ).val( 0 );
+                        break;
+                        // when deleting a term
+                        case 'delete-tag':
+                            update_rows( data['tag_ID'] );
+                        break;
+                        // in case the language is modified in quick edit and breaks translations
+                        case 'inline-save-tax':
+                            update_rows( data['tax_ID'] );
+                        break;
+                    }
                 );
+                }
+            }
+            var data = wpAjax.unserialize( settings.data ); // what were the data sent by the ajax request?
+            if ( 'undefined' != typeof( data['action'] ) ) {
+                switch ( data['action'] ) {
+                    // when adding a term, the new term_id is in the ajax response
+                    case 'add-tag':
+                        res = wpAjax.parseAjaxResponse( xhr.responseXML, 'ajax-response' );
+                        $.each(
+                            res.responses,
+                            function() {
+                                if ( 'term' == this.what ) {
+                                    update_rows( this.supplemental.term_id );
+                                }
+                            }
+                        );
+                        // and also reset translations hidden input fields
+                        $( '.htr_lang' ).val( 0 );
+                    break;
+                    // when deleting a term
+                    case 'delete-tag':
+                        update_rows( data['tag_ID'] );
+                    break;
+                    // in case the language is modified in quick edit and breaks translations
+                    case 'inline-save-tax':
+                        update_rows( data['tax_ID'] );
+                    break;
+                }
+            }
+        }
+    );
+})( jQuery );
+jQuery( document ).ready(
+        );
+    }
+);
+jQuery(
     function( $ ) {
         // translations autocomplete input box
 …
                     // when the input box is emptied
+                    $( this ).blur(
+                    $( this ).on(
+                        'blur',
                         function() {
                             if ( ! $( this ).val() ) {

polylang/trunk/js/term.min.js

r2349002	r2424335
1		!function(a){a(document).bind("DOMNodeInserted",function(t){var n=a(t.target);if("inline-edit"==n.attr("id")){var e=n.prev().attr("id").replace("tag-","");if(e>0){var l=n.find(':input[name="inline_lang_choice"]'),i=a("#lang_"+e).html();l.val(i),e==a("#default_cat_"+e).html()&&l.prop("disabled",!0)}}})}(jQuery),function(a){a(document).ajaxSuccess(function(t,n,e){function l(t){var n=new Array;a(".translation_"+t).each(function(){n.push(a(this).parent().parent().attr("id").substring(4))});var e={action:"pll_update_term_rows",term_id:t,translations:n.join(","),taxonomy:a("input[name='taxonomy']").val(),post_type:a("input[name='post_type']").val(),screen:a("input[name='screen']").val(),_pll_nonce:a("#_pll_nonce").val()};a.post(ajaxurl,e,function(t){if(t){var n=wpAjax.parseAjaxResponse(t,"ajax-response");a.each(n.responses,function(){"row"==this.what&&a("#tag-"+this.supplemental.term_id).replaceWith(this.data)})}})}var i=wpAjax.unserialize(e.data);if(void 0!==i.action)switch(i.action){case"add-tag":res=wpAjax.parseAjaxResponse(n.responseXML,"ajax-response"),a.each(res.responses,function(){"term"==this.what&&l(this.supplemental.term_id)}),a(".htr_lang").val(0);break;case"delete-tag":l(i.tag_ID);break;case"inline-save-tax":l(i.tax_ID)}})}(jQuery),jQuery(document).ready(function(a){function t(){a(".tr_lang").each(function(){var t=a(this).attr("id").substring(8),n=a(this).parent().parent().siblings(".pll-edit-column");a(this).autocomplete({minLength:0,source:ajaxurl+"?action=pll_terms_not_translated&term_language="+a("#term_lang_choice").val()+"&term_id="+a("input[name='tag_ID']").val()+"&taxonomy="+a("input[name='taxonomy']").val()+"&translation_language="+t+"&post_type="+typenow+"&_pll_nonce="+a("#_pll_nonce").val(),select:function(e,l){a("#htr_lang_"+t).val(l.item.id),n.html(l.item.link)}}),a(this).blur(function(){a(this).val()\|\|(a("#htr_lang_"+t).val(0),n.html(n.siblings(".hidden").children().clone()))})})}t(),a("#term_lang_choice").change(function(){var n=a(this).val(),e=a(this).children('option[value="'+n+'"]').attr("lang"),l=a('.pll-translation-column > span[lang="'+e+'"]').attr("dir"),i={action:"term_lang_choice",lang:n,from_tag:a("input[name='from_tag']").val(),term_id:a("input[name='tag_ID']").val(),taxonomy:a("input[name='taxonomy']").val(),post_type:typenow,_pll_nonce:a("#_pll_nonce").val()};a.post(ajaxurl,i,function(n){var e=wpAjax.parseAjaxResponse(n,"ajax-response");a.each(e.responses,function(){switch(this.what){case"translations":a("#term-translations").html(this.data),t();break;case"parent":a("#parent").replaceWith(this.data);break;case"tag_cloud":a(".tagcloud").replaceWith(this.data);break;case"flag":a(".pll-select-flag").html(this.data)}}),a("body").removeClass("pll-dir-rtl").removeClass("pll-dir-ltr").addClass("pll-dir-"+l)})})});
	1	jQuery(function(a){a(document).on("DOMNodeInserted",function(t){var n=a(t.target);if("inline-edit"==n.attr("id")){var e=n.prev().attr("id").replace("tag-","");if(e>0){var l=n.find(':input[name="inline_lang_choice"]'),i=a("#lang_"+e).html();l.val(i),e==a("#default_cat_"+e).html()&&l.prop("disabled",!0)}}})}),jQuery(function(a){a(document).ajaxSuccess(function(t,n,e){function l(t){var n=new Array;a(".translation_"+t).each(function(){n.push(a(this).parent().parent().attr("id").substring(4))});var e={action:"pll_update_term_rows",term_id:t,translations:n.join(","),taxonomy:a("input[name='taxonomy']").val(),post_type:a("input[name='post_type']").val(),screen:a("input[name='screen']").val(),_pll_nonce:a("#_pll_nonce").val()};a.post(ajaxurl,e,function(t){if(t){var n=wpAjax.parseAjaxResponse(t,"ajax-response");a.each(n.responses,function(){"row"==this.what&&a("#tag-"+this.supplemental.term_id).replaceWith(this.data)})}})}var i=wpAjax.unserialize(e.data);if(void 0!==i.action)switch(i.action){case"add-tag":res=wpAjax.parseAjaxResponse(n.responseXML,"ajax-response"),a.each(res.responses,function(){"term"==this.what&&l(this.supplemental.term_id)}),a(".htr_lang").val(0);break;case"delete-tag":l(i.tag_ID);break;case"inline-save-tax":l(i.tax_ID)}})}),jQuery(function(a){function t(){a(".tr_lang").each(function(){var t=a(this).attr("id").substring(8),n=a(this).parent().parent().siblings(".pll-edit-column");a(this).autocomplete({minLength:0,source:ajaxurl+"?action=pll_terms_not_translated&term_language="+a("#term_lang_choice").val()+"&term_id="+a("input[name='tag_ID']").val()+"&taxonomy="+a("input[name='taxonomy']").val()+"&translation_language="+t+"&post_type="+typenow+"&_pll_nonce="+a("#_pll_nonce").val(),select:function(e,l){a("#htr_lang_"+t).val(l.item.id),n.html(l.item.link)}}),a(this).on("blur",function(){a(this).val()\|\|(a("#htr_lang_"+t).val(0),n.html(n.siblings(".hidden").children().clone()))})})}t(),a("#term_lang_choice").change(function(){var n=a(this).val(),e=a(this).children('option[value="'+n+'"]').attr("lang"),l=a('.pll-translation-column > span[lang="'+e+'"]').attr("dir"),i={action:"term_lang_choice",lang:n,from_tag:a("input[name='from_tag']").val(),term_id:a("input[name='tag_ID']").val(),taxonomy:a("input[name='taxonomy']").val(),post_type:typenow,_pll_nonce:a("#_pll_nonce").val()};a.post(ajaxurl,i,function(n){var e=wpAjax.parseAjaxResponse(n,"ajax-response");a.each(e.responses,function(){switch(this.what){case"translations":a("#term-translations").html(this.data),t();break;case"parent":a("#parent").replaceWith(this.data);break;case"tag_cloud":a(".tagcloud").replaceWith(this.data);break;case"flag":a(".pll-select-flag").html(this.data)}}),a("body").removeClass("pll-dir-rtl").removeClass("pll-dir-ltr").addClass("pll-dir-"+l)})})});

polylang/trunk/js/widgets.js

-                      r2377116
+                      r2424335
         );
+        function pll_toggle( a, test ) {
+            test ? a.show() : a.hide();
+        }
+        // Remove all options if dropdown is checked.
+        $( '.widgets-sortables,.control-section-sidebar' ).on(
+            'change',
+            '.pll-dropdown',
+            function() {
+                var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
+                pll_toggle( $( '.no-dropdown-' + this_id ), true != $( this ).prop( 'checked' ) );
+            }
+        );
+        // Disallow unchecking both show names and show flags.
+        var options = ['-show_flags', '-show_names'];
+        $.each(
+            options,
+            function( i, v ) {
+                $( '.widgets-sortables,.control-section-sidebar' ).on(
+                    'change',
+                    '.pll' + v,
+                    function() {
+                        var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
+                        if ( true != $( this ).prop( 'checked' ) ) {
+                            $( '#widget-' + this_id + options[ 1 - i ] ).prop( 'checked', true );
+                        }
+                    }
+                );
+            }
+        );
+    }
 );

polylang/trunk/js/widgets.min.js

r2349002	r2424335
1		jQuery(function(e){var t,l,n;function i(t){if(n){t=e(t);var l=e(".widget-top .widget-title h3",t),i=e(".pll-lang-choice option:selected",t).val(),o=i&&n.hasOwnProperty(i)?n[i]:null;if(o){o+="   ";var d=e(".pll-lang",l);d.length?d.html(o):(flag=e("<span />").addClass("pll-lang").html(o),l.prepend(flag))}else e(".pll-lang",l).remove()}}if("undefined"!=typeof pll_widgets&&pll_widgets.hasOwnProperty("flags")&&(n=pll_widgets.flags),void 0!==wp.customize){function o(e){e.extended(wp.customize.Widgets.WidgetControl)&&(e.embedWidgetContent(),i(e.container.find(".widget")))}t=e("#customize-controls"),l=".customize-control .widget",wp.customize.control.each(o),wp.customize.control.bind("add",o)}else t=e("#widgets-right"),l=".widget";e(l,t).each(function(){i(this)}),t.on("change",".pll-lang-choice",function(){i(e(this).parents(".widget"))})});
	1	jQuery(function(e){var t,n,i;function o(t){if(i){t=e(t);var n=e(".widget-top .widget-title h3",t),o=e(".pll-lang-choice option:selected",t).val(),l=o&&i.hasOwnProperty(o)?i[o]:null;if(l){l+="   ";var a=e(".pll-lang",n);a.length?a.html(l):(flag=e("<span />").addClass("pll-lang").html(l),n.prepend(flag))}else e(".pll-lang",n).remove()}}if("undefined"!=typeof pll_widgets&&pll_widgets.hasOwnProperty("flags")&&(i=pll_widgets.flags),void 0!==wp.customize){function l(e){e.extended(wp.customize.Widgets.WidgetControl)&&(e.embedWidgetContent(),o(e.container.find(".widget")))}t=e("#customize-controls"),n=".customize-control .widget",wp.customize.control.each(l),wp.customize.control.bind("add",l)}else t=e("#widgets-right"),n=".widget";e(n,t).each(function(){o(this)}),t.on("change",".pll-lang-choice",function(){o(e(this).parents(".widget"))}),e(".widgets-sortables,.control-section-sidebar").on("change",".pll-dropdown",function(){var t,n=e(this).parent().parent().parent().children(".widget-id").attr("value");t=e(".no-dropdown-"+n),1!=e(this).prop("checked")?t.show():t.hide()});var a=["-show_flags","-show_names"];e.each(a,function(t,n){e(".widgets-sortables,.control-section-sidebar").on("change",".pll"+n,function(){var n=e(this).parent().parent().parent().children(".widget-id").attr("value");1!=e(this).prop("checked")&&e("#widget-"+n+a[1-t]).prop("checked",!0)})})});

polylang/trunk/modules/share-slug/settings-share-slug.php

-                      r2340428
+                      r2424335
         <script type='text/javascript'>
             //<![CDATA[
+            ( function( $ ){
+                $( "input[name='force_lang']" ).change( function() {
+                    var value = $( this ).val();
+                    if ( value > 0 ) {
+                        $( "#pll-module-share-slugs" ).removeClass( "inactive" ).addClass( "active" ).children( "td" ).children( ".row-actions" ).html( '<?php echo $activated; // phpcs:ignore WordPress.Security.EscapeOutput ?>' );
+                    }
+                    else {
+                        $( "#pll-module-share-slugs" ).removeClass( "active" ).addClass( "inactive" ).children( "td" ).children( ".row-actions" ).html( '<?php echo $deactivated; // phpcs:ignore WordPress.Security.EscapeOutput ?>' );
+                    }
+                } );
+            } )( jQuery );
+            jQuery(
+                function( $ ){
+                    $( "input[name='force_lang']" ).on( 'change', function() {
+                        var value = $( this ).val();
+                        if ( value > 0 ) {
+                            $( "#pll-module-share-slugs" ).removeClass( "inactive" ).addClass( "active" ).children( "td" ).children( ".row-actions" ).html( '<?php echo $activated; // phpcs:ignore WordPress.Security.EscapeOutput ?>' );
+                        }
+                        else {
+                            $( "#pll-module-share-slugs" ).removeClass( "active" ).addClass( "inactive" ).children( "td" ).children( ".row-actions" ).html( '<?php echo $deactivated; // phpcs:ignore WordPress.Security.EscapeOutput ?>' );
+                        }
+                    } );
+                }
+            );
             // ]]>
         </script>

polylang/trunk/modules/site-health/admin-site-health.php

r2340428	r2424335
7	7	* Class PLL_Admin_Site_Health to add debug info in WP Site Health.
8	8	*
9		* @~~link https://make.wordpress.org/core/2019/04/25/site-health-check-in-5-2/~~
	9	* @see https://make.wordpress.org/core/2019/04/25/site-health-check-in-5-2/ since WordPress 5.2
10	10	*
11	11	* @since 2.8

polylang/trunk/modules/sitemaps/sitemaps.php

-                      r2412239
+                      r2424335
             add_filter( 'rewrite_rules_array', array( $this, 'rewrite_rules' ) );
             add_filter( 'wp_sitemaps_add_provider', array( $this, 'replace_provider' ) );
         } else {
+        } elseif ( method_exists( $this->links_model, 'site_url' ) ) {
             add_filter( 'wp_sitemaps_index_entry', array( $this, 'index_entry' ) );
             add_filter( 'wp_sitemaps_stylesheet_url', array( $this->links_model, 'site_url' ) );
 …
         global $wp_rewrite;
         $newrules = array();
+        $languages = $this->model->get_languages_list( array( 'fields' => 'slug' ) );
+        $languages = $this->model->get_languages_list( array( 'fields' => 'slug' ) );
+        if ( empty( $languages ) ) {
+            return $rules;
+        }
         if ( $this->options['hide_default'] ) {
             $languages = array_diff( $languages, array( $this->options['default_lang'] ) );
+        }
         if ( ! empty( $languages ) ) {
+            $slug = $wp_rewrite->root . ( $this->options['rewrite'] ? '^' : '^language/' ) . '(' . implode( '|', $languages ) . ')/';
+        }
+        $slug = $wp_rewrite->root . ( $this->options['rewrite'] ? '^' : '^language/' ) . '(' . implode( '|', $languages ) . ')/';
+        $newrules = array();
         foreach ( $rules as $key => $rule ) {

polylang/trunk/modules/wizard/js/languages-step.js

-                      r2377116
+                      r2424335
  */
 jQuery( document ).ready(
+jQuery(
     function( $ ) {
         var addLanguageForm = $( '.languages-step' ); // Form element.
 …
             var languageValueHtml = $( '<td />' ).text( language.text ).prepend( language.flagUrl ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.prepend
             var languageTrashIconHtml = $( '<td />' )
+            .append( // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.append
+                $( '<span />' )
+                .addClass( 'dashicons dashicons-trash' )
+                .attr( 'data-language', language.locale )
                 .append( // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.append
                     $( '<span />' )
+                    .addClass( 'dashicons dashicons-trash' )
+                    .attr( 'data-language', language.locale )
+                    .append( // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.append
+                        $( '<span />' )
+                        .addClass( 'screen-reader-text' )
+                        .text( pll_wizard_params.i18n_remove_language_icon )
+                    )
+                );
+                    .addClass( 'screen-reader-text' )
+                    .text( pll_wizard_params.i18n_remove_language_icon )
+                )
+            );
             // see the comment and the harcoded code above. languageTrashIconHtml and languageValueHtml are safe.
             var languageLineHtml = $( '<tr />' ).prepend( languageTrashIconHtml ).prepend( languageValueHtml ); // phpcs:ignore WordPressVIPMinimum.JS.HTMLExecutingFunctions.prepend
 …
                     $( this ).parents( 'tr' ).remove();
                     // Remove input field.
                     languageField = languageFields.children( 'input[value=' + $( this ).data( 'language' ) + ']' ).remove();
+                    var languageField = languageFields.children( 'input[value=' + $( this ).data( 'language' ) + ']' ).remove();
                     // If there is no more languages hide languages table.
                     if ( languagesListTable.children().length <= 0 ) {
                         languagesTable.hide();
+                            languagesTable.hide();
+                    }
                     // Remove language from the Map.
 …
          */
         function focusOnField( field ) {
             field.focus();
+            field.trigger( 'focus' );
+        }

polylang/trunk/modules/wizard/js/languages-step.min.js

r2277136	r2424335
1		jQuery(document).ready(function(a){var e=a(".languages-step"),n=a("#language-fields"),t=a("#languages"),l=a("#languages tbody"),i=a("#defined-languages tbody"),r=a("#lang_list"),d=a('[name="save_step"]'),s=a("#messages"),o=new Map,g=a("#dialog");function u(e){var i=a("<td />").text(e.text).prepend(e.flagUrl),d=a("<td />").append(a("<span />").addClass("dashicons dashicons-trash").attr("data-language",e.locale).append(a("<span />").addClass("screen-reader-text").text(pll_wizard_params.i18n_remove_language_icon))),s=a("<tr />").prepend(d).prepend(i),g=a("<input />").attr({type:"hidden",name:"languages[]"}).val(e.locale);r.val(""),r.selectmenu("refresh"),o.set(e.locale,e),l.append(s),l.on("click","span[data-language="+e.locale+"]",function(e){e.preventDefault(),a(this).parents("tr").remove(),languageField=n.children("input[value="+a(this).data("language")+"]").remove(),l.children().length<=0&&t.hide(),o.delete(a(this).data("language")),c()}),n.append(g)}function p(e){s.empty(),s.prepend(a("<p/>").addClass("error").text(e))}function c(){s.empty(),e.find(".error").removeClass("error field-in-error")}function _(a){a.addClass("error field-in-error")}function m(a){a.focus()}r.on("selectmenuchange",function(){c()}),a("#add-language").on("click",function(e){c();var n=e.currentTarget.form.lang_list.options[e.currentTarget.form.lang_list.selectedIndex];if(""===n.value\|\|o.has(n.value)){var l=pll_wizard_params.i18n_no_language_selected;o.has(n.value)&&(l=pll_wizard_params.i18n_language_already_added),p(l),_(r.next("span.ui-selectmenu-button")),m(a("#lang_list-button"))}else u({locale:n.value,text:n.innerText,name:a(n).data("language-name"),flagUrl:a(n).data("flag-html")}),t.show(),m(a("#lang_list-button"))}),e.on("submit",function(n){var t,l=i.children().length>0,s=a("#lang_list").val();return o.size<=0&&!l?(""===s?(p(pll_wizard_params.i18n_no_language_added),_(r.next("span.ui-selectmenu-button")),m(a("#lang_list-button"))):(p(pll_wizard_params.i18n_add_language_needed),_(r.next("span.ui-selectmenu-button")),m(a("#add-language"))),!1):""!==s?(o.has(s)?(p(pll_wizard_params.i18n_language_already_added),_(r.next("span.ui-selectmenu-button")),m(a("#lang_list-button"))):g.dialog("open"),!1):((t=d).prop("disabled",!0),void e.append(a("<input />").prop({type:"hidden",name:t.prop("name"),value:t.prop("value")})))});var h=new URLSearchParams(document.location.search);function f(n){switch(n){case"yes":var t=a("#lang_list").children(":selected");u({locale:t[0].value,text:t[0].innerText,name:a(t).data("language-name"),flagUrl:a(t).data("flag-html")});break;case"no":r.val("")}g.dialog("close"),"ignore"===n?m(a("#lang_list-button")):e.submit()}h.has("activate_error")&&void 0!==pll_wizard_params[h.get("activate_error")]&&p(pll_wizard_params[h.get("activate_error")]),g.dialog({autoOpen:!1,modal:!0,draggable:!1,resizable:!1,title:pll_wizard_params.i18n_dialog_title,minWidth:600,maxWidth:"100%",open:function(e,n){a("body").hasClass("rtl")&&a(this).parent().css({right:a(this).parent().css("left"),left:"auto"}),a(this).find("#dialog-language").text(a("#lang_list").children(":selected")[0].innerText),a(this).find("#dialog-language-flag").empty().prepend(a("#lang_list").children(":selected").data("flag-html"))},buttons:[{text:pll_wizard_params.i18n_dialog_yes_button,click:function(a){f("yes")}},{text:pll_wizard_params.i18n_dialog_no_button,click:function(a){f("no")}},{text:pll_wizard_params.i18n_dialog_ignore_button,click:function(a){f("ignore")}}]})});
	1	jQuery(function(a){var e=a(".languages-step"),n=a("#language-fields"),t=a("#languages"),l=a("#languages tbody"),i=a("#defined-languages tbody"),r=a("#lang_list"),d=a('[name="save_step"]'),s=a("#messages"),o=new Map,g=a("#dialog");function u(e){var i=a("<td />").text(e.text).prepend(e.flagUrl),d=a("<td />").append(a("<span />").addClass("dashicons dashicons-trash").attr("data-language",e.locale).append(a("<span />").addClass("screen-reader-text").text(pll_wizard_params.i18n_remove_language_icon))),s=a("<tr />").prepend(d).prepend(i),g=a("<input />").attr({type:"hidden",name:"languages[]"}).val(e.locale);r.val(""),r.selectmenu("refresh"),o.set(e.locale,e),l.append(s),l.on("click","span[data-language="+e.locale+"]",function(e){e.preventDefault(),a(this).parents("tr").remove();n.children("input[value="+a(this).data("language")+"]").remove();l.children().length<=0&&t.hide(),o.delete(a(this).data("language")),c()}),n.append(g)}function p(e){s.empty(),s.prepend(a("<p/>").addClass("error").text(e))}function c(){s.empty(),e.find(".error").removeClass("error field-in-error")}function _(a){a.addClass("error field-in-error")}function m(a){a.trigger("focus")}r.on("selectmenuchange",function(){c()}),a("#add-language").on("click",function(e){c();var n=e.currentTarget.form.lang_list.options[e.currentTarget.form.lang_list.selectedIndex];if(""===n.value\|\|o.has(n.value)){var l=pll_wizard_params.i18n_no_language_selected;o.has(n.value)&&(l=pll_wizard_params.i18n_language_already_added),p(l),_(r.next("span.ui-selectmenu-button")),m(a("#lang_list-button"))}else u({locale:n.value,text:n.innerText,name:a(n).data("language-name"),flagUrl:a(n).data("flag-html")}),t.show(),m(a("#lang_list-button"))}),e.on("submit",function(n){var t,l=i.children().length>0,s=a("#lang_list").val();return o.size<=0&&!l?(""===s?(p(pll_wizard_params.i18n_no_language_added),_(r.next("span.ui-selectmenu-button")),m(a("#lang_list-button"))):(p(pll_wizard_params.i18n_add_language_needed),_(r.next("span.ui-selectmenu-button")),m(a("#add-language"))),!1):""!==s?(o.has(s)?(p(pll_wizard_params.i18n_language_already_added),_(r.next("span.ui-selectmenu-button")),m(a("#lang_list-button"))):g.dialog("open"),!1):((t=d).prop("disabled",!0),void e.append(a("<input />").prop({type:"hidden",name:t.prop("name"),value:t.prop("value")})))});var h=new URLSearchParams(document.location.search);function f(n){switch(n){case"yes":var t=a("#lang_list").children(":selected");u({locale:t[0].value,text:t[0].innerText,name:a(t).data("language-name"),flagUrl:a(t).data("flag-html")});break;case"no":r.val("")}g.dialog("close"),"ignore"===n?m(a("#lang_list-button")):e.submit()}h.has("activate_error")&&void 0!==pll_wizard_params[h.get("activate_error")]&&p(pll_wizard_params[h.get("activate_error")]),g.dialog({autoOpen:!1,modal:!0,draggable:!1,resizable:!1,title:pll_wizard_params.i18n_dialog_title,minWidth:600,maxWidth:"100%",open:function(e,n){a("body").hasClass("rtl")&&a(this).parent().css({right:a(this).parent().css("left"),left:"auto"}),a(this).find("#dialog-language").text(a("#lang_list").children(":selected")[0].innerText),a(this).find("#dialog-language-flag").empty().prepend(a("#lang_list").children(":selected").data("flag-html"))},buttons:[{text:pll_wizard_params.i18n_dialog_yes_button,click:function(a){f("yes")}},{text:pll_wizard_params.i18n_dialog_no_button,click:function(a){f("no")}},{text:pll_wizard_params.i18n_dialog_ignore_button,click:function(a){f("ignore")}}]})});

polylang/trunk/modules/wpml/wpml-api.php

-                      r2340428
+                      r2424335
     /**
      * In WPML, get a language's native and translated name for display in a custom language switcher
+     * Since Polylang does not implement the translated name, always returns only the native name
+     * Since Polylang does not implement the translated name, always returns only the native name,
+     * so the 3rd, 4th and 5th parameters are not used.
+     *
      * @since 2.2
+     *
+     * @param mixed       $null              Not used.
+     * @param string      $native_name       The language native name.
+     * @param string|bool $translated_name   The language translated name. Not used.
+     * @param bool        $native_hidden     Whether to hide the language native name or not. Not used.
+     * @param bool        $translated_hidden Whether to hide the language translated name or not. Not used.
+     * @return string
+     */
+    public function wpml_display_language_names( $null, $native_name, $translated_name = false, $native_hidden = false, $translated_hidden = false ) {
+     * @param mixed  $null        Not used.
+     * @param string $native_name The language native name.
+     * @return string
+     */
+    public function wpml_display_language_names( $null, $native_name ) {
         return $native_name;
+    }
 …
      * @since 2.0
+     *
-     * @param mixed $null Not used
      * @return bool
      */
     public function wpml_is_rtl( $null ) {
+    public function wpml_is_rtl() {
         return pll_current_language( 'is_rtl' );
+    }

polylang/trunk/modules/wpml/wpml-config.php

-                      r2340428
+                      r2424335
      */
     protected function register_or_translate_option( $context, $name, $key ) {
+        if ( PLL() instanceof PLL_Frontend ) {
+            $this->options[ $name ] = $key;
+            add_filter( 'option_' . $name, array( $this, 'translate_strings' ) );
+        $option_keys = $this->xml_to_array( $key );
+        new PLL_Translate_Option( $name, reset( $option_keys ), array( 'context' => $context ) );
+    }
+    /**
+     * Recursively transforms xml nodes to an array, ready for PLL_Translate_Option.
+     *
+     * @since 2.9
+     *
+     * @param object $key XML node.
+     * @param array  $arr Array of option keys to translate.
+     * @return array
+     */
+    protected function xml_to_array( $key, &$arr = array() ) {
+        $attributes = $key->attributes();
+        $name = (string) $attributes['name'];
+        $children = $key->children();
+        if ( count( $children ) ) {
+            foreach ( $children as $child ) {
+                $arr[ $name ] = $this->xml_to_array( $child, $arr[ $name ] );
+            }
         } else {
+            $this->register_string_recursive( $context, $name, get_option( $name ), $key );
+        }
+    }
+    /**
+     * Translates the strings for an option
+     *
+     * @since 1.0
+     *
+     * @param array|string $value Either a string to translate or a list of strings to translate
+     * @return array|string translated string(s)
+     */
+    public function translate_strings( $value ) {
+        $option = substr( current_filter(), 7 );
+        return $this->translate_strings_recursive( $value, $this->options[ $option ] );
+    }
+    /**
+     * Recursively registers strings for a serialized option
+     *
+     * @since 1.0
+     * @since 2.7 Signature modified
+     *
+     * @param string $context The group in which the strings will be registered.
+     * @param string $option  Option name.
+     * @param array  $values  Option value.
+     * @param object $key     XML node.
+     */
+    protected function register_string_recursive( $context, $option, $values, $key ) {
+        if ( is_object( $values ) ) {
+            $values = (array) $values;
+        }
+        $children = $key->children();
+        if ( is_array( $values ) ) {
+            if ( count( $children ) ) {
+                foreach ( $children as $child ) {
+                    $attributes = $child->attributes();
+                    $name = (string) $attributes['name'];
+                    if ( isset( $values[ $name ] ) ) {
+                        $this->register_string_recursive( $context, $name, $values[ $name ], $child );
+                        continue;
+                    }
+                    $pattern = '#^' . str_replace( '*', '(?:.+)', $name ) . '$#';
+                    foreach ( $values as $n => $value ) {
+                        // The first case could be handled by the next one, but we avoid calls to preg_match here.
+                        if ( '*' === $name || ( false !== strpos( $name, '*' ) && preg_match( $pattern, $n ) ) ) {
+                            $this->register_string_recursive( $context, $n, $value, $child );
+                        }
+                    }
+                }
+            } else {
+                foreach ( $values as $n => $value ) {
+                    // Parent key is a wildcard and no sub-key has been whitelisted.
+                    $this->register_string_recursive( $context, $n, $value, $key );
+                }
+            }
+        } else {
+            pll_register_string( $option, $values, $context, true );  // Multiline as in WPML.
+        }
+    }
+    /**
+     * Recursively translates strings for a serialized option
+     *
+     * @since 1.0
+     *
+     * @param array|string $values Either a string to translate or a list of strings to translate.
+     * @param object       $key     XML node.
+     * @return array|string Translated string(s)
+     */
+    protected function translate_strings_recursive( $values, $key ) {
+        $children = $key->children();
+        if ( is_array( $values ) || is_object( $values ) ) {
+            if ( count( $children ) ) {
+                foreach ( $children as $child ) {
+                    $attributes = $child->attributes();
+                    $name = (string) $attributes['name'];
+                    if ( is_array( $values ) && isset( $values[ $name ] ) ) {
+                        $values[ $name ] = $this->translate_strings_recursive( $values[ $name ], $child );
+                        continue;
+                    }
+                    if ( is_object( $values ) && isset( $values->$name ) ) {
+                        $values->$name = $this->translate_strings_recursive( $values->$name, $child );
+                        continue;
+                    }
+                    $pattern = '#^' . str_replace( '*', '(?:.+)', $name ) . '$#';
+                    foreach ( $values as $n => &$value ) {
+                        // The first case could be handled by the next one, but we avoid calls to preg_match here.
+                        if ( '*' === $name || ( false !== strpos( $name, '*' ) && preg_match( $pattern, $n ) ) ) {
+                            $value = $this->translate_strings_recursive( $value, $child );
+                        }
+                    }
+                }
+            } else {
+                // Parent key is a wildcard and no sub-key has been whitelisted.
+                foreach ( $values as &$value ) {
+                    $value = $this->translate_strings_recursive( $value, $key );
+                }
+            }
+        } else {
+            $values = pll__( $values );
+        }
+        return $values;
+            $arr[ $name ] = true; // Multiline as in WPML.
+        }
+        return $arr;
+    }
+}

polylang/trunk/modules/wpml/wpml-legacy-api.php

-                      r2412239
+                      r2424335
         // NB: When 'skip_missing' is false, WPML returns all languages even if there is no content
         $languages = PLL()->model->get_languages_list( array( 'hide_empty' => $args['skip_missing'] ) );
+        // FIXME: Backward compatibility with WP < 4.7
+        if ( function_exists( 'wp_list_sort' ) ) {
+            $languages = wp_list_sort( $languages, $orderby, $order ); // Since WP 4.7
+        }
+        $languages = wp_list_sort( $languages, $orderby, $order ); // Since WP 4.7
         foreach ( $languages as $lang ) {
 …
      * returns the post language
+     *
      * @see original WPML code at https://wpml.org/forums/topic/canonical-urls-for-wpml-duplicated-posts/#post-52198
+     * @see https://wpml.org/forums/topic/canonical-urls-for-wpml-duplicated-posts/#post-52198 for the original WPML code
+     *
      * @since 1.8
 …
      * Registers a string for translation in the "strings translation" panel
+     *
+     * The 4th and 5th parameters $allow_empty_value and $source_lang are not used by Polylang.
+     *
      * @since 0.9.3
+     *
 …
      * @param string $name              a unique name for the string
      * @param string $string            the string to register
+     * @param bool   $allow_empty_value not used
+     * @param string $source_lang       not used by Polylang
+     */
+    function icl_register_string( $context, $name, $string, $allow_empty_value = false, $source_lang = '' ) {
+     */
+    function icl_register_string( $context, $name, $string ) {
         PLL_WPML_Compat::instance()->register_string( $context, $name, $string );
+    }

polylang/trunk/polylang.php

-                      r2412239
+                      r2424335
  * Plugin URI:        https://polylang.pro
  * Description:       Adds multilingual capability to WordPress
  * Version:           2.8.4
  * Requires at least: 4.9
+ * Version:           2.9-beta1
+ * Requires at least: 5.1
  * Requires PHP:      5.6
  * Author:            WP SYNTEX
 …
 } else {
     // Go on loading the plugin
     define( 'POLYLANG_VERSION', '2.8.4' );
     define( 'PLL_MIN_WP_VERSION', '4.9' );
+    define( 'POLYLANG_VERSION', '2.9-beta1' );
+    define( 'PLL_MIN_WP_VERSION', '5.1' );
     define( 'PLL_MIN_PHP_VERSION', '5.6' );
 …
     define( 'POLYLANG', ucwords( str_replace( '-', ' ', dirname( POLYLANG_BASENAME ) ) ) );
+    require __DIR__ . '/include/class-polylang.php';
+    new Polylang();
+    if ( empty( $_GET['deactivate-polylang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+        new Polylang();
+    }
+}

polylang/trunk/readme.txt

-                      r2412239
+                      r2424335
 Donate link: https://polylang.pro
 Tags: multilingual, bilingual, translate, translation, language, multilanguage, international, localization
 Requires at least: 4.9
+Requires at least: 5.1
 Tested up to: 5.5
 Requires PHP: 5.6
 …
 == Installation ==
 . Make sure you are using WordPress 4.9 or later and that your server is running PHP 5.6 or later (same requirement as WordPress itself)
+. Make sure you are using WordPress 5.1 or later and that your server is running PHP 5.6 or later (same requirement as WordPress itself)
 . If you tried other multilingual plugins, deactivate them before activating Polylang, otherwise, you may get unexpected results!
 . Install and activate the plugin as usual from the 'Plugins' menu in WordPress.
 …
 == Changelog ==
+= 2.9 =
+* Add compatibility with WordPress 5.6
+* Pro: Add locale fallback used when the theme or plugins translations are not available
+* Pro: Fix post slugs for German and Danish in the REST API
+* Pro: Fix a fatal error in ACF integration when saving url modifications with multiple domains
+* Pro: Fix a deprecated notice fired by ACF since the version 5.9.2
+* Pro: Fix ACF relationship fields not reloaded when changing the language in the classic editor
+* Update plugin updater to version 1.8
+* Add Lower Sorbian to the list of predefined language
+* Options are now translated on backend when using the admin language filter
+* Keep previous translations when modifying an option value
+* Add navigation markup to the language switcher widget
+* Fix canonical redirect for taxonomy terms
+* Fix a fatal error when deleting a post with a translation group corrupted in the database
+* Fix a fatal error when switching to plain permalinks and using multiple domains
+* Fix a conflict with WP Sweep which could corrupt languages
+* Fix title displayed instead of meta description with Yoast SEO > 14.0
 = 2.8.4 (2020-11-03) =

polylang/trunk/settings/languages.php

-                      r2340428
+                      r2424335
         'facebook' => 'de_DE',
     ),
+    'dsb' => array(
+        'code'     => 'dsb',
+        'locale'   => 'dsb',
+        'name'     => 'Dolnoserbšćina',
+        'dir'      => 'ltr',
+        'flag'     => 'de',
+    ),
     'dzo' => array(
         'code'     => 'dz',

polylang/trunk/settings/settings-browser.php

-                      r2340428
+                      r2424335
         <script type='text/javascript'>
             //<![CDATA[
+            ( function( $ ){
+                $( "input[name='force_lang']" ).change( function() {
+                    var value = $( this ).val();
+                    if ( 3 > value ) {
+                        $( "#pll-module-browser" ).<?php echo $func; // phpcs:ignore WordPress.Security.EscapeOutput ?>.children( "td" ).children( ".row-actions" ).html( '<?php echo $link; // phpcs:ignore WordPress.Security.EscapeOutput ?>' );
+                    }
+                    else {
+                        $( "#pll-module-browser" ).removeClass( "active" ).addClass( "inactive" ).children( "td" ).children( ".row-actions" ).html( '<?php echo $deactivated; // phpcs:ignore WordPress.Security.EscapeOutput ?>' );
+                    }
+                } );
+            } )( jQuery );
+            jQuery(
+                function( $ ){
+                    $( "input[name='force_lang']" ).on( 'change', function() {
+                        var value = $( this ).val();
+                        if ( 3 > value ) {
+                            $( "#pll-module-browser" ).<?php echo $func; // phpcs:ignore WordPress.Security.EscapeOutput ?>.children( "td" ).children( ".row-actions" ).html( '<?php echo $link; // phpcs:ignore WordPress.Security.EscapeOutput ?>' );
+                        }
+                        else {
+                            $( "#pll-module-browser" ).removeClass( "active" ).addClass( "inactive" ).children( "td" ).children( ".row-actions" ).html( '<?php echo $deactivated; // phpcs:ignore WordPress.Security.EscapeOutput ?>' );
+                        }
+                    } );
+                }
+            );
             // ]]>
         </script>

polylang/trunk/settings/settings-module.php

r2340428	r2424335
217	217	* @return array Options
218	218	*/
219		protected function update( $options ) {
	219	protected function update( $options ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
220	220	return array(); // It's responsibility of the child class to decide what is saved
221	221	}

polylang/trunk/settings/settings.php

-                      r2398436
+                      r2424335
         $action = isset( $_REQUEST['pll_action'] ) ? sanitize_key( $_REQUEST['pll_action'] ) : ''; // phpcs:ignore WordPress.Security.NonceVerification
         if ( 'edit' === $action && ! empty( $_GET['lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
             // phpcs:ignore WordPress.Security.NonceVerification, WordPressVIPMinimum.Variables.VariableAnalysis.UnusedVariable
+            // phpcs:ignore WordPress.Security.NonceVerification, VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
             $edit_lang = $this->model->get_language( (int) $_GET['lang'] );
         } else {
 …
          * @since 1.7.10
          * @since 2.3 The languages arrays use associative keys instead of numerical keys
          * @see settings/languages.php
+         * @see https://github.com/polylang/polylang/blob/2.8.2/settings/languages.php the list of predefined languages
+         *
          * @param array $languages

polylang/trunk/settings/table-settings.php

r2340428	r2424335
187	187	* @param string $which 'top' or 'bottom'
188	188	*/
189		protected function display_tablenav( $which ) {}
	189	protected function display_tablenav( $which ) {} // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
190	190	}

polylang/trunk/vendor/composer/autoload_classmap.php

-                      r2340428
+                      r2424335
     'PLL_Filters' => $baseDir . '/include/filters.php',
     'PLL_Filters_Links' => $baseDir . '/include/filters-links.php',
+    'PLL_Filters_Sanitization' => $baseDir . '/include/filters-sanitization.php',
     'PLL_Frontend' => $baseDir . '/frontend/frontend.php',
     'PLL_Frontend_Auto_Translate' => $baseDir . '/frontend/frontend-auto-translate.php',
 …
     'PLL_Table_Settings' => $baseDir . '/settings/table-settings.php',
     'PLL_Table_String' => $baseDir . '/settings/table-string.php',
+    'PLL_Translate_Option' => $baseDir . '/include/translate-option.php',
     'PLL_Translated_Object' => $baseDir . '/include/translated-object.php',
     'PLL_Translated_Post' => $baseDir . '/include/translated-post.php',

polylang/trunk/vendor/composer/autoload_static.php

-                      r2398436
+                      r2424335
         'PLL_Filters' => __DIR__ . '/../..' . '/include/filters.php',
         'PLL_Filters_Links' => __DIR__ . '/../..' . '/include/filters-links.php',
+        'PLL_Filters_Sanitization' => __DIR__ . '/../..' . '/include/filters-sanitization.php',
         'PLL_Frontend' => __DIR__ . '/../..' . '/frontend/frontend.php',
         'PLL_Frontend_Auto_Translate' => __DIR__ . '/../..' . '/frontend/frontend-auto-translate.php',
 …
         'PLL_Table_Settings' => __DIR__ . '/../..' . '/settings/table-settings.php',
         'PLL_Table_String' => __DIR__ . '/../..' . '/settings/table-string.php',
+        'PLL_Translate_Option' => __DIR__ . '/../..' . '/include/translate-option.php',
         'PLL_Translated_Object' => __DIR__ . '/../..' . '/include/translated-object.php',
         'PLL_Translated_Post' => __DIR__ . '/../..' . '/include/translated-post.php',

Context Navigation

Legend:

Download in other formats: