Changeset 59430 for trunk/src/wp-includes/class-wp-textdomain-registry.php

Timestamp:

11/20/2024 02:48:40 AM (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].

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

File:

• trunk/src/wp-includes/class-wp-textdomain-registry.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-textdomain-registry.php

@@ -154 +154 @@
          */
         public function set_custom_path( $domain, $path ) {
+                // If just-in-time loading was triggered before, reset the entry so it can be tried again.
+
+                if ( isset( $this->all[ $domain ] ) ) {
+                        $this->all[ $domain ] = array_filter( $this->all[ $domain ] );
+                }
+
+                if ( empty( $this->current[ $domain ] ) ) {
+                        unset( $this->current[ $domain ] );
+                }
+
                 $this->custom_paths[ $domain ] = rtrim( $path, '/' );
         }
@@ -337 +347 @@
                  * using load_plugin_textdomain/load_theme_textdomain, use that one.
                  */
-                if ( 'en_US' !== $locale && isset( $this->custom_paths[ $domain ] ) ) {
+                if ( isset( $this->custom_paths[ $domain ] ) ) {
                         $fallback_location = rtrim( $this->custom_paths[ $domain ], '/' ) . '/';
                         $this->set( $domain, $locale, $fallback_location );