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

Timestamp:

01/30/2024 01:59:46 PM (3 years ago)

Author:

swissspidy

Message:

I18N: Improve singular lookup of pluralized strings.

Ensures that looking up a singular that is also used as a pluralized string works as expected.
This improves compatibility for cases where for example both __( 'Product' ) and _n( 'Product', 'Products’, num ) are used in a project, where both will use the same translation for the singular version.

Although such usage is not really recommended nor documented, it must continue to work in the new i18n library in order to maintain backward compatibility and maintain expected behavior.

See #59656.

File:

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

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

@@ -204 +204 @@
                 }
 
-                return $this->entries[ $text ] ?? false;
+                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;
         }