Changeset 29630 for trunk/src/wp-admin/setup-config.php

Timestamp:

08/26/2014 07:58:33 PM (12 years ago)

Author:

ocean90

Message:

Language packs: No WPLANG anymore.

• The WPLANG constant is no longer needed. Remove define('WPLANG', ); from wp-config-sample.php. Populate WPLANG option based on the WPLANG constant. When get_option('WPLANG') is an empty string it will override WPLANG.
• Introduce translations_api() which is available to communicate with the translation API. Move translation install related functions to a new file.
• Replace mu_dropdown_languages() with wp_dropdown_languages(). wp_dropdown_languages() is now populated by the translation API.
• Remove wp_install_load_language() and allow load_default_textdomain() to switch a core translation.

fixes #13069, #15677, #19760, #28730, #29281.

File:

• trunk/src/wp-admin/setup-config.php (modified) (7 diffs)

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

@@ -33 +33 @@
 require( ABSPATH . 'wp-settings.php' );
 
-require( ABSPATH . 'wp-admin/includes/upgrade.php' );
+/** Load WordPress Administration Upgrade API */
+require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+
+/** Load WordPress Translation Install API */
+require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
 nocache_headers();
@@ -86 +90 @@
 } // end function setup_config_display_header();
 
+$language = '';
+if ( ! empty( $_REQUEST['language'] ) ) {
+        $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
+}
 switch($step) {
         case -1:
-
-                if ( empty( $_GET['language'] ) && ( $languages = wp_get_available_translations_from_api() ) ) {
+                if ( empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
                         setup_config_display_header( 'language-chooser' );
                         echo '<form id="setup" method="post" action="?step=0">';
@@ -100 +107 @@
 
         case 0:
-                if ( ! empty( $_REQUEST['language'] ) ) {
-                        $loaded_language = wp_install_download_language_pack( $_REQUEST['language'] );
+                if ( ! empty( $language ) ) {
+                        $loaded_language = wp_download_language_pack( $language );
                         if ( $loaded_language ) {
-                                wp_install_load_language( $loaded_language );
+                                load_default_textdomain( $loaded_language );
                         }
                 }
@@ -137 +144 @@
 
         case 1:
-                $loaded_language = wp_install_load_language( $_REQUEST['language'] );
+                load_default_textdomain( $language );
                 setup_config_display_header();
         ?>
@@ -170 +177 @@
         </table>
         <?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
-        <input type="hidden" name="language" value="<?php echo esc_attr( $loaded_language ); ?>" />
+        <input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
         <p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
 </form>
@@ -177 +184 @@
 
         case 2:
-        $loaded_language = wp_install_load_language( $_REQUEST['language'] );
+        load_default_textdomain( $language );
         $dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
         $uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
@@ -190 +197 @@
         }
 
-        if ( $loaded_language ) {
-                $step_1 .= '&amp;language=' . $loaded_language;
-                $install .= '?language=' . $loaded_language;
+        if ( ! empty( $language ) ) {
+                $step_1 .= '&amp;language=' . $language;
+                $install .= '?language=' . $language;
         } else {
                 $install .= '?language=en_US';