Changeset 29705

Timestamp:

09/04/2014 02:38:17 PM (12 years ago)

Author:

nacin

Message:

i18n: Skip language chooser for localized packages.

Also fixes the install.php welcome string, which was not bring printed.

fixes #29487.

Location:

trunk/src/wp-admin

Files:

• install.php (modified) (5 diffs)
• setup-config.php (modified) (1 diff)

trunk/src/wp-admin/install.php

@@ -182 +182 @@
 }
 
-$langugage = '';
+$language = '';
 if ( ! empty( $_REQUEST['language'] ) ) {
-        $langugage = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
+        $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
+} elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
+        $language = $GLOBALS['wp_local_package'];
 }
 
@@ -190 +192 @@
         case 0: // Step 0
 
-                if ( wp_can_install_language_pack() && empty( $langugage ) && ( $languages = wp_get_available_translations() ) ) {
+                if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
                         display_header( 'language-chooser' );
                         echo '<form id="setup" method="post" action="?step=1">';
@@ -201 +203 @@
 
         case 1: // Step 1, direct link or from language chooser.
-                if ( ! empty( $langugage ) ) {
-                        $loaded_language = wp_download_language_pack( $langugage );
+                if ( ! empty( $language ) ) {
+                        $loaded_language = wp_download_language_pack( $language );
                         if ( $loaded_language ) {
                                 load_default_textdomain( $loaded_language );
@@ -212 +214 @@
 ?>
 <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
-<p><?php __( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
+<p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
 
 <h1><?php _e( 'Information needed' ); ?></h1>
@@ -221 +223 @@
                 break;
         case 2:
-                if ( ! empty( $langugage ) && load_default_textdomain( $langugage ) ) {
-                        $loaded_language = $langugage;
+                if ( ! empty( $language ) && load_default_textdomain( $language ) ) {
+                        $loaded_language = $language;
                         $GLOBALS['wp_locale'] = new WP_Locale();
                 } else {

trunk/src/wp-admin/setup-config.php

@@ -91 +91 @@
 if ( ! empty( $_REQUEST['language'] ) ) {
         $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
+} elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
+        $language = $GLOBALS['wp_local_package'];
 }
+
 switch($step) {
         case -1: