Changeset 11314

Timestamp:

11/05/2021 04:55:21 AM (3 years ago)

Author:

dd32

Message:

Translate: Custom Warnings: Support precision within printf strings, and add an extra safety check to prevent warning about an incorrect placeholder if it existed within the original.

Fixes #5927.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-warnings/wporg-gp-custom-warnings.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-custom-warnings/wporg-gp-custom-warnings.php

@@ -281 +281 @@
         if ( $is_sprintf ) {
             // Negative/Positive lookahead not used to allow the warning to include the context around the % sign.
-            preg_match_all( '/(?P<context>[^\s%]*)%((\d+\$(?:\d+)?)?(?P<char>.))/i', $translation, $m );
+            preg_match_all( '/(?P<context>[^\s%]*)%((\d+\$(?:\d+)?)?(\.\d+)?(?P<char>.))/i', $translation, $m );
 
             foreach ( $m['char'] as $i => $char ) {
-                // % is included for escaped %%.
-                if ( false === strpos( 'bcdefgosux%l', $char ) ) {
+                if (
+                    // % is included for escaped %%.
+                    false === strpos( 'bcdefgosux%l', $char ) &&
+                    // Check the "placeholder" doesn't exist within the original, as an extra safety mechanism.
+                    false === strpos( $original, $m[0][ $i ] )
+                ) {
                     $unexpected_tokens[] = $m[0][ $i ];
                 }
@@ -316 +320 @@
             // l is included for wp_sprintf_l()'s custom %l format.
             // @ is included for Swift (as used for iOS mobile app) %@ string format.
-            return '(?<!%)%(\d+\$(?:\d+)?)?[bcdefgosuxEFGX%l@]';
+            return '(?<!%)%(\d+\$(?:\d+)?)?(\.\d+)?[bcdefgosuxEFGX%l@]';
         } );
     }