From b70fdd0c527bd737e680fc0b15f2cb31b245811c Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 2 Sep 2014 08:10:16 +0000 Subject: [PATCH] Re-initialize $wp_locale global after changing the default textdomain on installation screens. props ocean90. fixes #29452. Built from https://develop.svn.wordpress.org/trunk@29669 git-svn-id: http://core.svn.wordpress.org/trunk@29443 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/install.php | 2 ++ wp-admin/setup-config.php | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/wp-admin/install.php b/wp-admin/install.php index daddaafd51..cce438ec4c 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -204,6 +204,7 @@ switch($step) { $loaded_language = wp_download_language_pack( $langugage ); if ( $loaded_language ) { load_default_textdomain( $loaded_language ); + $GLOBALS['wp_locale'] = new WP_Locale(); } } @@ -221,6 +222,7 @@ switch($step) { case 2: if ( ! empty( $langugage ) && load_default_textdomain( $langugage ) ) { $loaded_language = $langugage; + $GLOBALS['wp_locale'] = new WP_Locale(); } else { $loaded_language = 'en_US'; } diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 8c75c2bf9b..89fb7ddcd5 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -110,6 +110,7 @@ switch($step) { $loaded_language = wp_download_language_pack( $language ); if ( $loaded_language ) { load_default_textdomain( $loaded_language ); + $GLOBALS['wp_locale'] = new WP_Locale(); } } @@ -144,6 +145,8 @@ switch($step) { case 1: load_default_textdomain( $language ); + $GLOBALS['wp_locale'] = new WP_Locale(); + setup_config_display_header(); ?>
@@ -184,6 +187,8 @@ switch($step) { case 2: load_default_textdomain( $language ); + $GLOBALS['wp_locale'] = new WP_Locale(); + $dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) ); $uname = trim( wp_unslash( $_POST[ 'uname' ] ) ); $pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );