<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29007] trunk/src: Introduce wp_dropdown_languages() and use it on general settings.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29007">29007</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-07-05 06:18:50 +0000 (Sat, 05 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce wp_dropdown_languages() and use it on general settings.
Early rough cut. Obviously not fully implemented.
see <a href="http://core.trac.wordpress.org/ticket/15677">#15677</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options-general.php (29006 => 29007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options-general.php 2014-07-05 05:13:05 UTC (rev 29006)
+++ trunk/src/wp-admin/options-general.php 2014-07-05 06:18:50 UTC (rev 29007)
</span><span class="lines">@@ -304,14 +304,17 @@
</span><span class="cx"> <?php do_settings_fields('general', 'default'); ?>
</span><span class="cx"> <?php
</span><span class="cx"> $languages = get_available_languages();
</span><del>- if ( is_multisite() && !empty( $languages ) ):
</del><ins>+ if ( $languages ) :
</ins><span class="cx"> ?>
</span><span class="cx"> <tr>
</span><span class="cx"> <th width="33%" scope="row"><?php _e('Site Language') ?></th>
</span><span class="cx"> <td>
</span><del>- <select name="WPLANG" id="WPLANG">
- <?php mu_dropdown_languages( $languages, get_option('WPLANG') ); ?>
- </select>
</del><ins>+ <?php wp_dropdown_languages( array(
+ 'name' => 'WPLANG',
+ 'id' => 'WPLANG',
+ 'selected' => get_option( 'WPLANG' ),
+ 'languages' => $languages,
+ ) ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options.php (29006 => 29007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options.php 2014-07-05 05:13:05 UTC (rev 29006)
+++ trunk/src/wp-admin/options.php 2014-07-05 06:18:50 UTC (rev 29007)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> wp_die(__('Cheatin’ uh?'));
</span><span class="cx">
</span><span class="cx"> $whitelist_options = array(
</span><del>- 'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
</del><ins>+ 'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
</ins><span class="cx"> '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' ),
</span><span class="cx"> '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' ),
</span><span class="cx"> 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> $whitelist_options['general'][] = 'new_admin_email';
</span><del>- $whitelist_options['general'][] = 'WPLANG';
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter whether the post-by-email functionality is enabled.
</span></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/l10n.php (29006 => 29007)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/l10n.php 2014-07-05 05:13:05 UTC (rev 29006)
+++ trunk/src/wp-includes/l10n.php 2014-07-05 06:18:50 UTC (rev 29007)
</span><span class="lines">@@ -816,3 +816,24 @@
</span><span class="cx"> }
</span><span class="cx"> return $headers;
</span><span class="cx"> }
</span><ins>+
+/**
+ * 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>';
+}
</ins></span></pre>
</div>
</div>
</body>
</html>