<!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>[28984] trunk/src/wp-admin/install.php: If we already have a value for WPLANG when installing, insert this language at the top of the language selector and pre-select it.</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/28984">28984</a></dd>
<dt>Author</dt> <dd>johnbillion</dd>
<dt>Date</dt> <dd>2014-07-03 22:55:57 +0000 (Thu, 03 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>If we already have a value for WPLANG when installing, insert this language at the top of the language selector and pre-select it. See <a href="http://core.trac.wordpress.org/ticket/28577">#28577</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/install.php (28983 => 28984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/install.php 2014-07-03 22:53:01 UTC (rev 28983)
+++ trunk/src/wp-admin/install.php 2014-07-03 22:55:57 UTC (rev 28984)
</span><span class="lines">@@ -60,6 +60,12 @@
</span><span class="cx"> $response = wp_remote_post( $url, $options );
</span><span class="cx"> $body = wp_remote_retrieve_body( $response );
</span><span class="cx"> if ( $body && $body = json_decode( $body, true ) ) {
</span><ins>+ $languages = array();
+ // Key the language array with the language code
+ foreach ( $body['languages'] as $language ) {
+ $languages[$language['language']] = $language;
+ }
+ $body['languages'] = $languages;
</ins><span class="cx"> return $body;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -210,11 +216,18 @@
</span><span class="cx"> echo '<label for="language_default">English (United States)</label>';
</span><span class="cx"> echo "\n";
</span><span class="cx">
</span><ins>+ if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && ( 'en_US' !== WPLANG ) ) {
+ if ( isset( $body['languages'][WPLANG] ) ) {
+ $language = $body['languages'][WPLANG];
+ echo '<input type="radio" name="language" checked="checked" class="' . esc_attr( $language['language'] ) . ' screen-reader-input" id="language_wplang" value="' . esc_attr( $language['language'] ) . '">';
+ echo '<label for="language_wplang">' . esc_html( $language['native_name'] ) . "</label>\n";
+ }
+ }
+
</ins><span class="cx"> foreach ( $body['languages'] as $language ) {
</span><span class="cx"> echo '<input type="radio" name="language" class="' . esc_attr( $language['language'] ) . ' screen-reader-input" id="language_'. esc_attr( $language['language'] ) .'" value="' . esc_attr( $language['language'] ) . '">';
</span><span class="cx"> echo '<label for="language_' . esc_attr( $language['language'] ) . '">' . esc_html( $language['native_name'] ) . "</label>\n";
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> echo "</fieldset>\n";
</span><span class="cx"> echo '<p class="step"><input type="submit" class="button button-primary button-hero" value="»" /></p>';
</span><span class="cx"> echo '</form>';
</span></span></pre>
</div>
</div>
</body>
</html>