Changeset 57286

Timestamp:

01/15/2024 06:55:59 PM (8 months ago)

Author:

swissspidy

Message:

Upgrade/Install: Fix JavaScript localization on install page.

Blocks registration causes scripts to be initialized and localized very early, before the current locale has been properly set on the installation page.

This changes determine_locale() so that the locale chosen during installation is recognized and loaded earlier, ensuring proper script localization.

Props sabernhardt, NekoJonez, jornp, costdev.
Fixes #58696

Location:

trunk

Files:

• src/wp-admin/install.php (modified) (1 diff)
• src/wp-includes/l10n.php (modified) (1 diff)
• tests/phpunit/tests/l10n/determineLocale.php (modified) (2 diffs)

trunk/src/wp-admin/install.php

@@ -330 +330 @@
 $language = '';
 if ( ! empty( $_REQUEST['language'] ) ) {
-    $language = preg_replace( '/[^a-zA-Z0-9_]/', '', $_REQUEST['language'] );
+    $language = sanitize_locale_name( $_REQUEST['language'] );
 } elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
     $language = $GLOBALS['wp_local_package'];

trunk/src/wp-includes/l10n.php

@@ -151 +151 @@
     ) {
         $determined_locale = get_user_locale();
+    } elseif (
+        ( ! empty( $_REQUEST['language'] ) || isset( $GLOBALS['wp_local_package'] ) )
+        && wp_installing()
+    ) {
+        if ( ! empty( $_REQUEST['language'] ) ) {
+            $determined_locale = sanitize_locale_name( $_REQUEST['language'] );
+        } else {
+            $determined_locale = $GLOBALS['wp_local_package'];
+        }
     }
 

trunk/tests/phpunit/tests/l10n/determineLocale.php

@@ -21 +21 @@
 
     public function tear_down() {
-        unset( $_SERVER['CONTENT_TYPE'], $_GET['_locale'], $_COOKIE['wp_lang'], $GLOBALS['pagenow'] );
+        unset(
+            $_SERVER['CONTENT_TYPE'],
+            $_GET['_locale'],
+            $_COOKIE['wp_lang'],
+            $GLOBALS['pagenow'],
+            $GLOBALS['wp_local_package'],
+            $_REQUEST['language']
+        );
+        wp_installing( false );
 
         parent::tear_down();
@@ -274 +282 @@
         $this->assertSame( 'siteLocale', determine_locale() );
     }
+
+    public function test_language_param_not_installing() {
+        $_REQUEST['language'] = 'de_DE';
+        $this->assertSame( 'en_US', determine_locale() );
+    }
+
+    public function test_language_param_installing() {
+        $_REQUEST['language'] = 'de_DE';
+        wp_installing( true );
+        $this->assertSame( 'de_DE', determine_locale() );
+    }
+
+    public function test_language_param_installing_incorrect_string() {
+        $_REQUEST['language'] = '####';  // Something sanitize_locale_name() strips away.
+        wp_installing( true );
+        $this->assertSame( 'en_US', determine_locale() );
+    }
+
+    public function test_wp_local_package_global_not_installing() {
+        $_REQUEST['language'] = 'de_DE';
+        $this->assertSame( 'en_US', determine_locale() );
+    }
+    public function test_wp_local_package_global_installing() {
+        $_REQUEST['language'] = 'de_DE';
+        wp_installing( true );
+        $this->assertSame( 'de_DE', determine_locale() );
+    }
 }