Changeset 29007

Timestamp:

07/05/2014 06:18:50 AM (10 years ago)

Author:

nacin

Message:

Introduce wp_dropdown_languages() and use it on general settings.

Early rough cut. Obviously not fully implemented.

see #15677.

Location:

trunk/src

Files:

• wp-admin/options-general.php (modified) (1 diff)
• wp-admin/options.php (modified) (2 diffs)
• wp-includes/l10n.php (modified) (1 diff)

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

@@ -305 +305 @@
 <?php
     $languages = get_available_languages();
-    if ( is_multisite() && !empty( $languages ) ):
+    if ( $languages ) :
 ?>
     <tr>
         <th width="33%" scope="row"><?php _e('Site Language') ?></th>
         <td>
-            <select name="WPLANG" id="WPLANG">
-                <?php mu_dropdown_languages( $languages, get_option('WPLANG') ); ?>
-            </select>
+            <?php wp_dropdown_languages( array(
+                'name'      => 'WPLANG',
+                'id'        => 'WPLANG',
+                'selected'  => get_option( 'WPLANG' ),
+                'languages' => $languages,
+            ) ); ?>
         </td>
     </tr>

trunk/src/wp-admin/options.php

@@ -73 +73 @@
 
 $whitelist_options = array(
-    'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
+    'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
     'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
     'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
@@ -108 +108 @@
 } else {
     $whitelist_options['general'][] = 'new_admin_email';
-    $whitelist_options['general'][] = 'WPLANG';
 
     /**

trunk/src/wp-includes/l10n.php

@@ -817 +817 @@
     return $headers;
 }
+
+/**
+ * Language selector. More to come.
+ *
+ * @since 4.0.0
+ */
+function wp_dropdown_languages( $args = array() ) {
+    if ( isset( $args['languages'] ) ) {
+        $languages = $args['languages'];
+    } else {
+        $languages = get_available_languages();
+    }
+
+    printf( '<select name="%s" id="%s">', esc_attr( $args['name'] ), esc_attr( $args['id'] ) );
+    echo '<option value="">en_US</option>';
+    foreach ( $languages as $language ) {
+        $selected = selected( $language, $args['selected'], false );
+        echo '<option value="' . esc_attr( $language ) .'"' . $selected . '>' . $language . '</option>';
+    }
+    echo '</select>';
+}