Changeset 29630 for trunk/src/wp-admin/install.php

Timestamp:

08/26/2014 07:58:33 PM (10 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/install.php (modified) (5 diffs)

trunk/src/wp-admin/install.php

@@ -38 +38 @@
 /** 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' );
 
 /** Load wpdb */
@@ -179 +182 @@
 }
 
+$langugage = '';
+if ( ! empty( $_REQUEST['language'] ) ) {
+    $langugage = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
+}
+
 switch($step) {
     case 0: // Step 0
 
-        if ( empty( $_GET['language'] ) && ( $languages = wp_get_available_translations_from_api() ) ) {
+        if ( empty( $langugage ) && ( $languages = wp_get_available_translations() ) ) {
             display_header( 'language-chooser' );
             echo '<form id="setup" method="post" action="?step=1">';
@@ -193 +201 @@
 
     case 1: // Step 1, direct link or from language chooser.
-        if ( ! empty( $_REQUEST['language'] ) ) {
-            $loaded_language = wp_install_download_language_pack( $_REQUEST['language'] );
+        if ( ! empty( $langugage ) ) {
+            $loaded_language = wp_download_language_pack( $langugage );
             if ( $loaded_language ) {
-                wp_install_load_language( $loaded_language );
+                load_default_textdomain( $loaded_language );
             }
         }
@@ -212 +220 @@
         break;
     case 2:
-        if ( !empty( $_REQUEST['language'] ) ) {
-            $loaded_language = wp_install_load_language( $_REQUEST['language'] );
+        if ( ! empty( $langugage ) && load_default_textdomain( $langugage ) ) {
+            $loaded_language = $langugage;
         } else {
             $loaded_language = 'en_US';
@@ -227 +235 @@
         $admin_password = isset($_POST['admin_password']) ? wp_unslash( $_POST['admin_password'] ) : '';
         $admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : '';
-        $admin_email  = isset( $_POST['admin_email']  ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
-        $public       = isset( $_POST['blog_public']  ) ? (int) $_POST['blog_public'] : 0;
+        $admin_email  = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
+        $public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
 
         // Check e-mail address.