Changeset 59433 for branches/6.7/tests/phpunit/tests/l10n/wpTextdomainRegistry.php

Timestamp:

11/20/2024 01:32:57 PM (2 years ago)

Author:

desrosj

Message:

i18n: Account for load_*_textdomain() after JIT loading.

When load_*_textdomain() functions are called after WordPress has already attempted just-in-time loading of translations, nothing happens.

This updates the related logic to retry translation loading when a custom path is set to ensure all translations are available.

Additionally, this also fixes cases where an en_US.mo file is provided with non-English strings to override the default language.

Follow up to [59157].

Reviewed by SergeyBiryukov.
Merges [59430] to the 6.7 branch.

Props swissspidy, peterwilsoncc, desrosj, apermo, sergeybiryukov, wildworks, tigriweb, twvania, looswebstudio, stimul, audrasjb, finntown, bluantinoo, timwhitlock, albigdd.
See #62337.

Location:

branches/6.7

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/l10n/wpTextdomainRegistry.php (modified) (1 diff)

branches/6.7/tests/phpunit/tests/l10n/wpTextdomainRegistry.php

@@ -40 +40 @@
                         'Incorrect availability status for textdomain with custom path'
                 );
-                $this->assertFalse(
+                $this->assertSame(
+                        WP_LANG_DIR . '/bar/',
                         $this->instance->get( 'foo', 'en_US' ),
-                        'Should not return custom path for textdomain and en_US locale'
+                        'Should return custom path for textdomain and en_US locale'
                 );
                 $this->assertSame(