Ticket #29362: 29362.2.patch

src/wp-admin/options-general.php

@@ -308 +308 @@
                 <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 = '';
+                        $lang = get_option( 'WPLANG' );
+                        if ( ! in_array( $lang, $languages ) ) {
+                                $lang = '';
                         }
 
                         wp_dropdown_languages( array(
                                 'name'         => 'WPLANG',
                                 'id'           => 'WPLANG',
-                                'selected'     => $locale,
+                                'selected'     => $lang,
                                 'languages'    => $languages,
                                 'translations' => $translations,
                                 'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(),