Changeset 14814

Timestamp:

04/14/2026 08:37:26 AM (4 weeks ago)

Author:

dd32

Message:

Plugin Directory: Fix edge-cases that caused translated readme strings not rendering on localised plugin pages.

This was primarily nested lists, but also headers outside of the expected range.
Some additional matching around whitespace is included for resilience.

Props dd32, masteradhoc.
Closes ​https://github.com/WordPress/wordpress.org/pull/605.
Fixes ​https://github.com/WordPress/wordpress.org/issues/601.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• class-plugin-i18n.php (modified) (1 diff)
• cli/i18n/class-readme-import.php (modified) (3 diffs)
• tests/Plugin_I18n_Test.php (added)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php

@@ -394 +394 @@
             $content = $marker;
         } else {
-            $original = preg_quote( $original, '/' );
-
-            if ( false === strpos( $content, '<' ) ) {
+            $original = preg_quote( trim( $original ), '/' );
+
+            if ( ! str_contains( $content, '<' ) ) {
                 $content = preg_replace( "/\b{$original}\b/", $marker, $content );
             } else {
-                $content = preg_replace( "/(<([a-z0-9]*)\b[^>]*>){$original}(<\/\\2>)/m", "\${1}{$marker}\${3}", $content );
+                $content = preg_replace( "/(<([a-z0-9]*)\b[^>]*>)\s*{$original}\s*(<\/\\2>)/m", "\${1}{$marker}\${3}", $content );
+
+                // Nested lists: match <li>STRING<ul> or <li>STRING<ol>.
+                if ( ! str_contains( $content, $marker ) ) {
+                    $content = preg_replace( "/(<li\b[^>]*>)\s*{$original}\s*(<[uo]l\b[^>]*>)/m", "\${1}{$marker}\${2}", $content );
+                }
             }
         }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-readme-import.php

@@ -89 +89 @@
         foreach ( $readme->sections as $section_key => $section_text ) {
             
-            if ( preg_match_all( '~<(h[3-4]|dt)[^>]*>([^<].+)</\1>~', $section_text, $matches ) ) {
+            if ( preg_match_all( '~<(h[1-6]|dt)[^>]*>([^<].+)</\1>~', $section_text, $matches ) ) {
                 if ( ! empty( $matches[2] ) ) {
                     foreach ( $matches[2] as $text ) {
@@ -97 +97 @@
                         }
 
-                        $section_strings = $this->handle_translator_comment( $section_strings, $text, "{$section_key} header" );
+                        $section_strings = $this->handle_translator_comment( $section_strings, trim( $text ), "{$section_key} header" );
                         if ( 'changelog' === $section_key ) {
                             $str_priorities[ $text ] = -1;
@@ -108 +108 @@
                 if ( ! empty( $matches[1] ) ) {
                     foreach ( $matches[1] as $text ) {
-                        $section_strings = $this->handle_translator_comment( $section_strings, $text, "{$section_key} list item" );
+                        $section_strings = $this->handle_translator_comment( $section_strings, trim( $text ), "{$section_key} list item" );
                         if ( 'changelog' === $section_key ) {
                             $str_priorities[ $text ] = -1;