Changeset 11315

Timestamp:

11/05/2021 05:03:11 AM (5 years ago)

Author:

dd32

Message:

Translate: Custom Warnings: Partially revert [11314] in favour of the upstream changes.

See ​https://github.com/GlotPress/GlotPress-WP/pull/1271.
See #5927.

File:

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

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+)?)?(\.\d+)?(?P<char>.))/i', $translation, $m );
+                        preg_match_all( '/(?P<context>[^\s%]*)%((\d+\$(?:\d+)?)?(?P<char>.))/i', $translation, $m );
 
                         foreach ( $m['char'] as $i => $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 ] )
-                                ) {
+                                // % is included for escaped %%.
+                                if ( false === strpos( 'bcdefgosux%l.', $char ) ) {
                                         $unexpected_tokens[] = $m[0][ $i ];
                                 }