Changeset 29630 for trunk/src/wp-admin/network/settings.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/network/settings.php (modified) (5 diffs)

trunk/src/wp-admin/network/settings.php

@@ -103 +103 @@
                                         <p class="description">
                                                 <?php _e( 'This email address will receive notifications. Registration and support emails will also come from this address.' ); ?>
-                                        </p>    
+                                        </p>
                                 </td>
                         </tr>
@@ -166 +166 @@
                                         <p class="description">
                                                 <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
-                                        </p>    
+                                        </p>
                                 </td>
                         </tr>
@@ -232 +232 @@
                                         <p class="description">
                                                 <?php _e( 'The first comment on a new site.' ) ?>
-                                        </p>    
+                                        </p>
                                 </td>
                         </tr>
@@ -274 +274 @@
                 </table>
 
-<?php
+                <?php
                 $languages = get_available_languages();
                 if ( ! empty( $languages ) ) {
-                        $lang = get_site_option( 'WPLANG' );
-?>
-                <h3><?php _e( 'Language Settings' ); ?></h3>
-                <table class="form-table">
+                        ?>
+                        <h3><?php _e( 'Language Settings' ); ?></h3>
+                        <table class="form-table">
                                 <tr>
                                         <th><label for="WPLANG"><?php _e( 'Default Language' ); ?></label></th>
                                         <td>
-                                                <select name="WPLANG" id="WPLANG">
-                                                        <?php mu_dropdown_languages( $languages, get_site_option( 'WPLANG' ) ); ?>
-                                                </select>
+                                                <?php
+                                                $lang = get_site_option( 'WPLANG' );
+                                                if ( ! in_array( $lang, $languages ) ) {
+                                                        $lang = '';
+                                                }
+
+                                                wp_dropdown_languages( array(
+                                                        'name'      => 'WPLANG',
+                                                        'id'        => 'WPLANG',
+                                                        'selected'  => $lang,
+                                                        'languages' => $languages,
+                                                ) );
+                                                ?>
                                         </td>
                                 </tr>
-                </table>
-<?php
-                } // languages
-?>
+                        </table>
+                        <?php
+                }
+                ?>
 
                 <h3><?php _e( 'Menu Settings' ); ?></h3>
@@ -325 +334 @@
                 </table>
 
-                <?php 
+                <?php
                 /**
                  * Fires at the end of the Network Settings form, before the submit button.