Changeset 3051260

Timestamp:

03/14/2024 05:44:34 PM (5 months ago)

Author:

Chouby

Message:

Version 3.6-rc1

Location:

polylang/trunk

Files:

• js/build/post.js (modified) (1 diff)
• js/build/post.min.js (modified) (1 diff)
• js/build/term.js (modified) (2 diffs)
• js/build/term.min.js (modified) (1 diff)
• modules/wpml/wpml-config.php (modified) (7 diffs)
• polylang.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• vendor/composer/installed.php (modified) (2 diffs)

polylang/trunk/js/build/post.js

@@ -26 +26 @@
         const handleQuickEditInsertion = ( mutationsList ) => {
             for ( const mutation of mutationsList ) {
-                const form = mutation.addedNodes[0];
+                const addedNodes = Array.from( mutation.addedNodes ).filter( el => el.nodeType === Node.ELEMENT_NODE )
+                const form = addedNodes[0];
                 if ( 0 < mutation.addedNodes.length && form.classList.contains( 'inline-editor' ) ) {
                     // WordPress has inserted the quick edit form.

polylang/trunk/js/build/post.min.js

@@ -1 @@
-var __webpack_exports__={};jQuery((function(n){n.ajaxPrefilter((function(e,t,a){"string"==typeof e.data&&-1!==e.data.indexOf("action=ajax-tag-search")&&(lang=n(':input[name="inline_lang_choice"]').val())&&(e.data="lang="+lang+"&"+e.data)}))})),jQuery((function(n){const e=document.getElementById("the-list");new MutationObserver((e=>{for(const i of e){const o=i.addedNodes[0];if(0<i.addedNodes.length&&o.classList.contains("inline-editor")){const s=Number(o.id.substring(5));if(s>0){const l=o.querySelector('select[name="inline_lang_choice"]'),c=document.querySelector("#lang_"+String(s)).innerHTML;l.value=c,t(c),a(c),l.addEventListener("change",(function(n){const e=n.target.value;t(e),a(e)}))}}function t(e){"undefined"!=typeof pll_term_languages&&n.each(pll_term_languages,(function(t,a){n.each(a,(function(a,i){n.each(i,(function(i){id="#"+a+"-"+pll_term_languages[t][a][i],e==t?n(id).show():n(id).hide()}))}))}))}function a(e){"undefined"!=typeof pll_page_languages&&n.each(pll_page_languages,(function(t,a){n.each(a,(function(a){v=n('#post_parent option[value="'+pll_page_languages[t][a]+'"]'),e==t?v.show():v.hide()}))}))}}})).observe(e,{childList:!0,subtree:!0})})),jQuery((function(n){n(document).ajaxSuccess((function(e,t,a){if("string"==typeof a.data){var i=wpAjax.unserialize(a.data);void 0!==i.action&&"inline-save"==i.action&&function(e){var t=new Array;n(".translation_"+e).each((function(){t.push(n(this).parent().parent().attr("id").substring(5))}));var a={action:"pll_update_post_rows",post_id:e,translations:t.join(","),post_type:n("input[name='post_type']").val(),screen:n("input[name='screen']").val(),_pll_nonce:n("input[name='_inline_edit']").val()};n.post(ajaxurl,a,(function(e){if(e){var t=wpAjax.parseAjaxResponse(e,"pll-ajax-response");n.each(t.responses,(function(){"row"==this.what&&n("#post-"+this.supplemental.post_id).replaceWith(this.data)}))}}))}(i.post_ID)}}))})),jQuery((function(n){n.ajaxPrefilter((function(e,t,a){"string"==typeof e.data&&-1!==e.data.indexOf("action=find_posts")&&(e.data="pll_post_id="+n("#affected").val()+"&"+e.data)}))}));
+var __webpack_exports__={};jQuery((function(.data)}))}));

polylang/trunk/js/build/term.js

@@ -11 +11 @@
         const handleQuickEditInsertion = ( mutationsList ) => {
             for ( const mutation of mutationsList ) {
-                const form = mutation.addedNodes[0];
+                const addedNodes = Array.from( mutation.addedNodes ).filter( el => el.nodeType === Node.ELEMENT_NODE )
+                const form = addedNodes[0];
                 if ( 0 < mutation.addedNodes.length && form.classList.contains( 'inline-edit-row' ) ) {
                     // WordPress has inserted the quick edit form.
@@ -23 +24 @@
 
                         // Disable the language dropdown for default categories.
-                        const default_cat = document.querySelector( `#default_cat_${term_id}` ).innerHTML;
+                        const default_cat = document.querySelector( `#default_cat_${term_id}` ).innerHTML;
                         if ( term_id == default_cat ) {
                             select.disabled = true;

polylang/trunk/js/build/term.min.js

@@ -1 @@
-var __webpack_exports__={};jQuery((function(t){const a=t=>{for(const a of t){const t=a.addedNodes[0];if(0<a.addedNodes.length&&t.classList.contains("inline-edit-row")){const a=Number(t.id.substring(5));if(a>0){const e=t.querySelector('select[name="inline_lang_choice"]'),n=document.querySelector("#lang_"+String(a)).innerHTML;e.value=n;a==document.querySelector(`#default_cat_${a}`).innerHTML&&(e.disabled=!0)}}}},e=document.getElementById("the-list");if(null!==e){const t={childList:!0,subtree:!0};new MutationObserver(a).observe(e,t)}})),jQuery((function(t){t(document).ajaxSuccess((function(a,e,n){function l(a){var e=new Array;t(".translation_"+a).each((function(){e.push(t(this).parent().parent().attr("id").substring(4))}));var n={action:"pll_update_term_rows",term_id:a,translations:e.join(","),taxonomy:t("input[name='taxonomy']").val(),post_type:t("input[name='post_type']").val(),screen:t("input[name='screen']").val(),_pll_nonce:t("#_pll_nonce").val()};t.post(ajaxurl,n,(function(a){if(a){var e=wpAjax.parseAjaxResponse(a,"pll-ajax-response");t.each(e.responses,(function(){"row"==this.what&&t("#tag-"+this.supplemental.term_id).replaceWith(this.data)}))}}))}var s=wpAjax.unserialize(n.data);if(void 0!==s.action)switch(s.action){case"add-tag":res=wpAjax.parseAjaxResponse(e.responseXML,"pll-ajax-response"),t.each(res.responses,(function(){"term"==this.what&&l(this.supplemental.term_id)})),t(".htr_lang").val(0);break;case"delete-tag":l(s.tag_ID);break;case"inline-save-tax":l(s.tax_ID)}}))})),jQuery((function(t){function a(){t(".tr_lang").each((function(){var a=t(this).attr("id").substring(8),e=t(this).parent().parent().siblings(".pll-edit-column");t(this).autocomplete({minLength:0,source:ajaxurl+"?action=pll_terms_not_translated&term_language="+t("#term_lang_choice").val()+"&term_id="+t("input[name='tag_ID']").val()+"&taxonomy="+t("input[name='taxonomy']").val()+"&translation_language="+a+"&post_type="+typenow+"&_pll_nonce="+t("#_pll_nonce").val(),select:function(n,l){t("#htr_lang_"+a).val(l.item.id),e.html(l.item.link)}}),t(this).on("blur",(function(){t(this).val()||(t("#htr_lang_"+a).val(0),e.html(e.siblings(".hidden").children().clone()))}))}))}a(),t("#term_lang_choice").on("change",(function(){var e=t(this).val(),n=t(this).children('option[value="'+e+'"]').attr("lang"),l=t('.pll-translation-column > span[lang="'+n+'"]').attr("dir"),s={action:"term_lang_choice",lang:e,from_tag:t("input[name='from_tag']").val(),term_id:t("input[name='tag_ID']").val(),taxonomy:t("input[name='taxonomy']").val(),post_type:typenow,_pll_nonce:t("#_pll_nonce").val()};t.post(ajaxurl,s,(function(e){var n=wpAjax.parseAjaxResponse(e,"pll-ajax-response");t.each(n.responses,(function(){switch(this.what){case"translations":t("#term-translations").html(this.data),a();break;case"parent":t("#parent").replaceWith(this.data);break;case"tag_cloud":t(".tagcloud").replaceWith(this.data);break;case"flag":t(".pll-select-flag").html(this.data)}})),t("body").removeClass("pll-dir-rtl").removeClass("pll-dir-ltr").addClass("pll-dir-"+l)}))}))}));
+var __webpack_exports__={};jQuery((function(t){const a=t=>{for(const a of t){const t=&&(e.disabled=!0)}}}},e=document.getElementById("the-list");if(null!==e){const t={childList:!0,subtree:!0};new MutationObserver(a).observe(e,t)}})),jQuery((function(t){t(document).ajaxSuccess((function(a,e,n){function l(a){var e=new Array;t(".translation_"+a).each((function(){e.push(t(this).parent().parent().attr("id").substring(4))}));var n={action:"pll_update_term_rows",term_id:a,translations:e.join(","),taxonomy:t("input[name='taxonomy']").val(),post_type:t("input[name='post_type']").val(),screen:t("input[name='screen']").val(),_pll_nonce:t("#_pll_nonce").val()};t.post(ajaxurl,n,(function(a){if(a){var e=wpAjax.parseAjaxResponse(a,"pll-ajax-response");t.each(e.responses,(function(){"row"==this.what&&t("#tag-"+this.supplemental.term_id).replaceWith(this.data)}))}}))}var s=wpAjax.unserialize(n.data);if(void 0!==s.action)switch(s.action){case"add-tag":res=wpAjax.parseAjaxResponse(e.responseXML,"pll-ajax-response"),t.each(res.responses,(function(){"term"==this.what&&l(this.supplemental.term_id)})),t(".htr_lang").val(0);break;case"delete-tag":l(s.tag_ID);break;case"inline-save-tax":l(s.tax_ID)}}))})),jQuery((function(t){function a(){t(".tr_lang").each((function(){var a=t(this).attr("id").substring(8),e=t(this).parent().parent().siblings(".pll-edit-column");t(this).autocomplete({minLength:0,source:ajaxurl+"?action=pll_terms_not_translated&term_language="+t("#term_lang_choice").val()+"&term_id="+t("input[name='tag_ID']").val()+"&taxonomy="+t("input[name='taxonomy']").val()+"&translation_language="+a+"&post_type="+typenow+"&_pll_nonce="+t("#_pll_nonce").val(),select:function(n,l){t("#htr_lang_"+a).val(l.item.id),e.html(l.item.link)}}),t(this).on("blur",(function(){t(this).val()||(t("#htr_lang_"+a).val(0),e.html(e.siblings(".hidden").children().clone()))}))}))}a(),t("#term_lang_choice").on("change",(function(){var e=t(this).val(),n=t(this).children('option[value="'+e+'"]').attr("lang"),l=t('.pll-translation-column > span[lang="'+n+'"]').attr("dir"),s={action:"term_lang_choice",lang:e,from_tag:t("input[name='from_tag']").val(),term_id:t("input[name='tag_ID']").val(),taxonomy:t("input[name='taxonomy']").val(),post_type:typenow,_pll_nonce:t("#_pll_nonce").val()};t.post(ajaxurl,s,(function(e){var n=wpAjax.parseAjaxResponse(e,"pll-ajax-response");t.each(n.responses,(function(){switch(this.what){case"translations":t("#term-translations").html(this.data),a();break;case"parent":t("#parent").replaceWith(this.data);break;case"tag_cloud":t(".tagcloud").replaceWith(this.data);break;case"flag":t(".pll-select-flag").html(this.data)}})),t("body").removeClass("pll-dir-rtl").removeClass("pll-dir-ltr").addClass("pll-dir-"+l)}))}))}));

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

@@ -46 +46 @@
      * List of rules to extract strings to translate from blocks.
      *
-     * @var string[][][]|null
+     * @var array
+     *
+     * @phpstan-var array{
+     *     xpath?: array<non-empty-string, list<non-empty-string>>,
+     *     key?: array<non-empty-string, array<array|true>>
+     * }|null
      */
     protected $parsing_rules = null;
@@ -413 +418 @@
      *
      * @since 3.3
-     *
-     * @param string[][] $parsing_rules Rules for blocks attributes to translate.
-     * @return string[][] Rules completed with ones from wpml-config file.
-     *
-     * @phpstan-param array<string,array<string>> $parsing_rules
-     * @phpstan-return array<string,array<string>>
+     * @since 3.6 Format changed from `array<string>` to `array<non-empty-string, array|true>`.
+     *
+     * @param array $parsing_rules Rules for blocks attributes to translate.
+     * @return array Rules completed with ones from wpml-config file.
+     *
+     * @phpstan-param array<non-empty-string, array|true> $parsing_rules
+     * @phpstan-return array<non-empty-string, array|true>
      */
     public function translate_blocks_attributes( $parsing_rules ) {
@@ -431 +437 @@
      * @param string $rule_tag Tag name to extract.
      * @return string[][] The rules.
+
+
+
+
+
      */
     protected function get_blocks_parsing_rules( $rule_tag ) {
@@ -447 +458 @@
      *
      * @return string[][][] Rules completed with ones from wpml-config file.
+
+
+
+
+
      */
     protected function extract_blocks_parsing_rules() {
@@ -478 +494 @@
                         case 'xpath':
                             $rule = trim( (string) $child );
+
+
+
+
                             break;
 
                         case 'key':
-                            $rule = $this->get_field_attribute( $child, 'name' );
+                            $rule = $this->get_field_attributes( $child );
+
+                            if ( empty( $rule ) ) {
+                                break;
+                            }
+
+                            if ( isset( $parsing_rules['key'][ $block_name ] ) ) {
+                                $parsing_rules['key'][ $block_name ] = $this->array_merge_recursive( $parsing_rules['key'][ $block_name ], $rule );
+                            } else {
+                                $parsing_rules['key'][ $block_name ] = $rule;
+                            }
                             break;
                     }
-
-                    if ( '' !== $rule ) {
-                        $parsing_rules[ $child_tag ][ $block_name ][] = $rule;
-                    }
                 }
             }
@@ -493 +519 @@
 
         return $parsing_rules;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 
@@ -564 +612 @@
 
         return trim( (string) $attributes[ $attribute_name ] );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 

polylang/trunk/polylang.php

@@ -11 +11 @@
  * Plugin URI:        https://polylang.pro
  * Description:       Adds multilingual capability to WordPress
- * Version:           3.6-beta2
+ * Version:           3.6-
  * Requires at least: 6.2
  * Requires PHP:      7.0
@@ -54 +54 @@
 } else {
     // Go on loading the plugin
-    define( 'POLYLANG_VERSION', '3.6-beta2' );
+    define( 'POLYLANG_VERSION', '3.6-' );
     define( 'PLL_MIN_WP_VERSION', '6.2' );
     define( 'PLL_MIN_PHP_VERSION', '7.0' );

polylang/trunk/readme.txt

@@ -4 +4 @@
 Tags: multilingual, translate, translation, language, localization
 Requires at least: 6.2
-Tested up to: 6.4
+Tested up to: 6.
 Requires PHP: 7.0
 Stable tag: 3.5.4
@@ -109 +109 @@
 * Requires WP 6.2 as minimum version
 * Add compatibility with WP 6.5
-* Pro: Add DeepL machine translation for posts and terms
-* Pro: Add export and import of XLIFF 2.0/2.1
+* Pro: Add DeepL machine translation for posts
+* Pro: Add export and import 
 * Pro: Improve translator comments in exported PO files
-* Pro: Allow to export and import JSON encoded post and term metas
-* Pro: Include footer notes block in translation files
+* Pro: Allow to export JSON encoded post and term metas in XLIFF files
+* Pro: Allow to export block sub-attributes in XLIFF files
+* Pro: Add footer notes block to XLIFF files
 * Pro: Single files are now exported directly instead of inside a zip
 * Pro: Reworked the language switcher navigation block
-* Pro: Fix language switcher navigation block justification not aligned with core settings in overlay menu. Requires WP 6.5
+* Pro: Fix language switcher navigation block justification not aligned with core settings in overlay menu
 * Pro: Fix a race condition which could lead to display a notice to the wrong user
+
+
 * Add filter `pll_cookie_args` to filter the Polylang cookie arguments #1406
 * Fix wrong translated post types and taxononies after a `switch_to_blog()` #1415
 * Fix a minor performance issue for the page for posts #1412
-* Fix a JS error after quick edit. Props @mcguffin #1435
+* Fix a JS error
 * Fix a possible warning in view-translations-post.php #1439
 

polylang/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'fb89dbcecf83c3d455976ec73ff3627ac51b5c46',
+        'reference' => '6',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'fb89dbcecf83c3d455976ec73ff3627ac51b5c46',
+            'reference' => '6',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',