Changeset 57505

Timestamp:

01/31/2024 09:49:08 PM (3 years ago)

Author:

swissspidy

Message:

I18N: Revert [57386] pending further investigation.

Reverts the change for fallback string lookup due to a performance regression in the bad case scenario.

See #59656.

Location:

trunk

Files:

• src/wp-includes/l10n/class-wp-translation-file.php (modified) (1 diff)
• tests/phpunit/tests/l10n/wpTranslationsConvert.php (modified) (1 diff)

trunk/src/wp-includes/l10n/class-wp-translation-file.php

@@ -204 +204 @@
                 }
 
-                if ( isset( $this->entries[ $text ] ) ) {
-                        return $this->entries[ $text ];
-                }
-
-                /*
-                 * Handle cases where a pluralized string is only used as a singular one.
-                 * For example, when both __( 'Product' ) and _n( 'Product', 'Products' )
-                 * are used, the entry key will have the format "ProductNULProducts".
-                 * Fall back to looking up just "Product" to support this edge case.
-                 */
-                foreach ( $this->entries as $key => $value ) {
-                        if ( str_starts_with( $key, $text . "\0" ) ) {
-                                $parts = explode( "\0", $value );
-                                return $parts[0];
-                        }
-                }
-
-                return false;
+                return $this->entries[ $text ] ?? false;
         }
 

trunk/tests/phpunit/tests/l10n/wpTranslationsConvert.php

@@ -200 +200 @@
                 $this->assertSame( 'translation0 with context', $controller->translate_plural( array( 'plural0 with context', 'plural1 with context' ), 1, 'context', 'unittest' ) );
                 $this->assertSame( 'translation1 with context', $controller->translate_plural( array( 'plural0 with context', 'plural1 with context' ), 2, 'context', 'unittest' ) );
-
-                $this->assertSame( 'Produkt', $controller->translate( 'Product', '', 'unittest' ) );
-                $this->assertSame( 'Produkt', $controller->translate_plural( array( 'Product', 'Products' ), 1, '', 'unittest' ) );
-                $this->assertSame( 'Produkte', $controller->translate_plural( array( 'Product', 'Products' ), 2, '', 'unittest' ) );
         }