Changeset 39885

Timestamp:

01/12/2017 04:27:17 AM (8 years ago)

Author:

SergeyBiryukov

Message:

I18N: Move "Site Language" setting above "Timezone".

This brings all locale-specific site settings closer together and prevents the language setting from being pushed down by unrelated settings added by plugins.

Props johnjamesjacoby.
Fixes #38562.

File:

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

trunk/src/wp-admin/options-general.php

@@ -121 +121 @@
 </td>
 </tr>
-<?php } ?>
+<?php }
+
+$languages = get_available_languages();
+$translations = wp_get_available_translations();
+if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
+    $languages[] = WPLANG;
+}
+if ( ! empty( $languages ) || ! empty( $translations ) ) {
+    ?>
+    <tr>
+        <th width="33%" scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>
+        <td>
+            <?php
+            $locale = get_locale();
+            if ( ! in_array( $locale, $languages ) ) {
+                $locale = '';
+            }
+
+            wp_dropdown_languages( array(
+                'name'         => 'WPLANG',
+                'id'           => 'WPLANG',
+                'selected'     => $locale,
+                'languages'    => $languages,
+                'translations' => $translations,
+                'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(),
+            ) );
+
+            // Add note about deprecated WPLANG constant.
+            if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
+                if ( is_super_admin() ) {
+                    ?>
+                    <p class="description">
+                        <strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %s constant in your %s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
+                    </p>
+                    <?php
+                }
+                _deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %s constant in your %s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
+            }
+            ?>
+        </td>
+    </tr>
+    <?php
+}
+?>
 <tr>
 <?php
@@ -318 +361 @@
 </tr>
 <?php do_settings_fields('general', 'default'); ?>
-
-<?php
-$languages = get_available_languages();
-$translations = wp_get_available_translations();
-if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
-    $languages[] = WPLANG;
-}
-if ( ! empty( $languages ) || ! empty( $translations ) ) {
-    ?>
-    <tr>
-        <th width="33%" scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>
-        <td>
-            <?php
-            $locale = get_locale();
-            if ( ! in_array( $locale, $languages ) ) {
-                $locale = '';
-            }
-
-            wp_dropdown_languages( array(
-                'name'         => 'WPLANG',
-                'id'           => 'WPLANG',
-                'selected'     => $locale,
-                'languages'    => $languages,
-                'translations' => $translations,
-                'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(),
-            ) );
-
-            // Add note about deprecated WPLANG constant.
-            if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
-                if ( is_super_admin() ) {
-                    ?>
-                    <p class="description">
-                        <strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %s constant in your %s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
-                    </p>
-                    <?php
-                }
-                _deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %s constant in your %s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
-            }
-            ?>
-        </td>
-    </tr>
-    <?php
-}
-?>
 </table>