<!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>[29372] trunk/src/wp-admin: Language chooser imporvements.</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/29372">29372</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-08-04 20:46:42 +0000 (Mon, 04 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Language chooser imporvements.
* Use a translated 'Continue' string.
* Go back to using a select element.
* Only show a spinner when we're installing a language.
see <a href="http://core.trac.wordpress.org/ticket/28577">#28577</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssinstallcss">trunk/src/wp-admin/css/install.css</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminjslanguagechooserjs">trunk/src/wp-admin/js/language-chooser.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssinstallcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/install.css (29371 => 29372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/install.css 2014-08-04 18:48:07 UTC (rev 29371)
+++ trunk/src/wp-admin/css/install.css 2014-08-04 20:46:42 UTC (rev 29372)
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx"> text-align: left;
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><del>-.step .button-large {
- font-size: 14px;
</del><ins>+.language-chooser.wp-core-ui .step .button.button-large {
+ height: 36px;
</ins><span class="cx"> }
</span><span class="cx"> textarea {
</span><span class="cx"> border: 1px solid #dfdfdf;
</span><span class="lines">@@ -325,59 +325,22 @@
</span><span class="cx"> max-width: 300px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.language-chooser fieldset {
- margin: 1px;
</del><ins>+.language-chooser select {
</ins><span class="cx"> padding: 8px;
</span><ins>+ width: 100%;
</ins><span class="cx"> display: block;
</span><span class="cx"> border: 1px solid #ddd;
</span><del>- -webkit-border-radius: 0;
- border-radius: 0; /* Reset mobile webkit's default element styling */
- -webkit-transition: .05s border-color ease-in-out;
- transition: .05s border-color ease-in-out;
- outline: 0;
- -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
- box-shadow: inset 0 1px 2px rgba(0,0,0,0.07);
</del><span class="cx"> background-color: #fff;
</span><span class="cx"> color: #333;
</span><span class="cx"> font-size: 16px;
</span><del>- font-family: inherit;
- font-weight: inherit;
- overflow-y: scroll;
- height: 250px;
</del><ins>+ font-family: Arial, sans-serif;
+ font-weight: normal;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.language-chooser fieldset.focus {
- border-color: #5b9dd9;
- -webkit-box-shadow: 0 0 2px rgba(30,140,190,0.8);
- box-shadow: 0 0 2px rgba(30,140,190,0.8);
-}
-
-.wp-core-ui.language-chooser .button.button-hero {
- font-size: 30px;
- line-height: 30px;
-}
-
</del><span class="cx"> .language-chooser p {
</span><span class="cx"> text-align: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.language-chooser input:checked + label{
- color:white;
- background: #777;
-}
-
-.language-chooser .focus input:checked + label{
- background: #0074A2;
-}
-
-.language-chooser label:hover {
- background: #eee;
-}
-
-.language-chooser label{
- display:block;
-}
-
</del><span class="cx"> .screen-reader-input,
</span><span class="cx"> .screen-reader-text {
</span><span class="cx"> position: absolute;
</span><span class="lines">@@ -404,7 +367,9 @@
</span><span class="cx">
</span><span class="cx"> .step .spinner {
</span><span class="cx"> display: inline-block;
</span><ins>+ margin-top: 8px;
</ins><span class="cx"> margin-right: 15px;
</span><ins>+ vertical-align: top;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/upgrade.php (29371 => 29372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/upgrade.php 2014-08-04 18:48:07 UTC (rev 29371)
+++ trunk/src/wp-admin/includes/upgrade.php 2014-08-04 20:46:42 UTC (rev 29372)
</span><span class="lines">@@ -2193,27 +2193,40 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><ins>+/**
+ * Output the input fields for the language selection form on the installation screen.
+ *
+ * @since 4.0.0
+ *
+ * @see wp_get_available_translations_from_api()
+ *
+ * @param array $languages Array of available languages (populated via the Translations API).
+ */
</ins><span class="cx"> function wp_install_language_form( $languages ) {
</span><del>- echo "<fieldset>\n";
- echo "<legend class='screen-reader-text'>Select a default language</legend>\n";
- echo '<input type="radio" checked="checked" class="screen-reader-input language-chooser-input" name="language" id="language_default" value="">';
- echo '<label for="language_default" lang="en">English (United States)</label>';
</del><ins>+ $installed_languages = get_available_languages();
+
+ echo "<label class='screen-reader-text' for='language'>Select a default language</label>\n";
+ echo "<select size='14' name='language' id='language'>\n";
+ echo '<option value="" lang="en" selected="selected" data-continue="Continue" data-installed="1">English (United States)</option>';
</ins><span class="cx"> echo "\n";
</span><span class="cx">
</span><span class="cx"> if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && ( 'en_US' !== WPLANG ) ) {
</span><span class="cx"> if ( isset( $languages[ WPLANG ] ) ) {
</span><span class="cx"> $language = $languages[ WPLANG ];
</span><del>- 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" lang="' . esc_attr( $language['iso'][1] ) . '">' . esc_html( $language['native_name'] ) . "</label>\n";
</del><ins>+ echo '<option value="' . esc_attr( $language['language'] ) . '" lang="' . esc_attr( $language['iso'][1] ) . '">' . esc_html( $language['native_name'] ) . "</option>\n";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach ( $languages as $language ) {
</span><del>- echo '<input type="radio" name="language" class="' . esc_attr( $language['language'] ) . ' screen-reader-input language-chooser-input" id="language_'. esc_attr( $language['language'] ) .'" value="' . esc_attr( $language['language'] ) . '">';
- echo '<label for="language_' . esc_attr( $language['language'] ) . '" lang="' . esc_attr( $language['iso'][1] ) . '">' . esc_html( $language['native_name'] ) . "</label>\n";
</del><ins>+ printf( '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
+ esc_attr( $language['language'] ),
+ esc_attr( $language['iso'][1] ),
+ esc_attr( $language['strings']['continue'] ),
+ in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
+ esc_html( $language['native_name'] ) );
</ins><span class="cx"> }
</span><del>- echo "</fieldset>\n";
- echo '<p class="step"><span class="spinner"></span><input type="submit" class="button button-primary button-hero" value="»" /></p>';
</del><ins>+ echo "</select>\n";
+ echo '<p class="step"><span class="spinner"></span><input id="language-continue" type="submit" class="button button-primary button-large" value="Continue" /></p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpadminjslanguagechooserjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/language-chooser.js (29371 => 29372)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/language-chooser.js 2014-08-04 18:48:07 UTC (rev 29371)
+++ trunk/src/wp-admin/js/language-chooser.js 2014-08-04 20:46:42 UTC (rev 29372)
</span><span class="lines">@@ -1,43 +1,26 @@
</span><del>-(function($){
- if ( $('body').hasClass('language-chooser') === false ) {
- return;
- }
</del><ins>+jQuery( function($) {
</ins><span class="cx">
</span><del>- var mouseDown = 0,
- $fieldset = $('fieldset');
</del><ins>+var select = $( '#language' ),
+ submit = $( '#language-continue' );
</ins><span class="cx">
</span><del>- // simple way to check if mousebutton is depressed while accounting for multiple mouse buttons being used independently
- document.body.onmousedown = function() {
- ++mouseDown;
- };
- document.body.onmouseup = function() {
- --mouseDown;
- };
</del><ins>+if ( ! $( 'body' ).hasClass( 'language-chooser' ) ) {
+ return;
+}
</ins><span class="cx">
</span><del>- /*
- we can't rely upon the focusout event
- since clicking on a label triggers it
- */
- function maybeRemoveFieldsetFocus(){
- if (mouseDown) {
- setTimeout( maybeRemoveFieldsetFocus, 50);
- return;
- }
- if ( $(':focus').hasClass('language-chooser-input') !== true ) {
- $fieldset.removeClass('focus');
- }
- }
-
- $fieldset.focusin( function() {
- $(this).addClass('focus');
</del><ins>+select.focus().on( 'change', function() {
+ var option = select.children( 'option:selected' );
+ submit.attr({
+ value: option.data( 'continue' ),
+ lang: option.attr( 'lang' )
</ins><span class="cx"> });
</span><ins>+});
</ins><span class="cx">
</span><del>- $fieldset.focusout( function() {
- setTimeout( maybeRemoveFieldsetFocus, 50);
- });
</del><ins>+$( 'form' ).submit( function() {
+ // Don't show a spinner for English and installed languages,
+ // as there is nothing to download.
+ if ( ! select.children( 'option:selected' ).data( 'installed' ) ) {
+ $( this ).find( '.step .spinner' ).css( 'visibility', 'visible' );
+ }
+});
</ins><span class="cx">
</span><del>- $('form').submit(function(){
- $(this).find('.step .spinner').css('visibility','visible');
- });
-
-})(jQuery);
</del><ins>+});
</ins></span></pre>
</div>
</div>
</body>
</html>