Changeset 54797

Timestamp:

11/10/2022 07:38:20 PM (2 years ago)

Author:

ocean90

Message:

I18N: Always pass $locale to load_textdomain().

In [53874] the optional $locale parameter was added to load_textdomain(). While most load_textdomain() calls in core were were updated, some were missed. Passing the original locale avoids the need to call determine_locale() by load_textdomain() which is used as a fallback.

Props ocean90, swissspidy, desrosj.
See #57060.

Location:

trunk/src

Files:

• wp-admin/includes/admin.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/rest-api/endpoints/class-wp-rest-site-health-controller.php (modified) (1 diff)

trunk/src/wp-admin/includes/admin.php

@@ -14 +14 @@
      * load_default_textdomain() will not have done so in this context.
      */
-    load_textdomain( 'default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo' );
+    $admin_locale = get_locale();
+    load_textdomain( 'default', WP_LANG_DIR . '/admin-' . $admin_locale . '.mo', $admin_locale );
+    unset( $admin_locale );
 }
 

trunk/src/wp-includes/functions.php

@@ -6352 +6352 @@
         $mofile        = WP_LANG_DIR . '/continents-cities-' . $locale_loaded . '.mo';
         unload_textdomain( 'continents-cities' );
-        load_textdomain( 'continents-cities', $mofile );
+        load_textdomain( 'continents-cities', $mofile, $locale_loaded );
         $mo_loaded = true;
     }

trunk/src/wp-includes/load.php

@@ -1393 +1393 @@
             foreach ( $locations as $location ) {
                 if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
-                    load_textdomain( 'default', $location . '/' . $locale . '.mo' );
+                    load_textdomain( 'default', $location . '/' . $locale . '.mo', $locale );
                     if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) ) {
-                        load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+                        load_textdomain( 'default', $location . '/admin-' . $locale . '.mo', $locale );
                     }
                     break 2;

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-site-health-controller.php

@@ -337 +337 @@
         if ( ! is_admin() ) {
             $locale = determine_locale();
-            load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
+            load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo", $locale );
         }
     }