Changeset 28984

Timestamp:

07/03/2014 10:55:57 PM (10 years ago)

Author:

johnbillion

Message:

If we already have a value for WPLANG when installing, insert this language at the top of the language selector and pre-select it. See #28577

File:

• trunk/src/wp-admin/install.php (modified) (2 diffs)

trunk/src/wp-admin/install.php

@@ -61 +61 @@
     $body = wp_remote_retrieve_body( $response );
     if ( $body && $body = json_decode( $body, true ) ) {
+        $languages = array();
+        // Key the language array with the language code
+        foreach ( $body['languages'] as $language ) {
+            $languages[$language['language']] = $language;
+        }
+        $body['languages'] = $languages;
         return $body;
     }
@@ -211 +217 @@
             echo "\n";
 
+            if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && ( 'en_US' !== WPLANG ) ) {
+                if ( isset( $body['languages'][WPLANG] ) ) {
+                    $language = $body['languages'][WPLANG];
+                    echo '<input type="radio" name="language" checked="checked" class="' . esc_attr( $language['language'] ) . ' screen-reader-input" id="language_wplang" value="' . esc_attr( $language['language'] ) . '">';
+                    echo '<label for="language_wplang">' . esc_html( $language['native_name'] ) . "</label>\n";
+                }
+            }
+
             foreach ( $body['languages'] as $language ) {
                 echo '<input type="radio" name="language" class="' . esc_attr( $language['language'] ) . ' screen-reader-input" id="language_'. esc_attr( $language['language'] ) .'" value="' . esc_attr( $language['language'] ) . '">';
                 echo '<label for="language_' . esc_attr( $language['language'] ) . '">' . esc_html( $language['native_name'] ) . "</label>\n";
             }
-
             echo "</fieldset>\n";
             echo '<p class="step"><input type="submit" class="button button-primary button-hero" value="&raquo;" /></p>';