<!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>[29018] trunk/src: Language on install: Docs and naming cleanups.</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/29018">29018</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-07-07 21:48:50 +0000 (Mon, 07 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Language on install: Docs and naming cleanups. see <a href="http://core.trac.wordpress.org/ticket/28577">#28577</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/upgrade.php (29017 => 29018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/upgrade.php 2014-07-07 20:29:32 UTC (rev 29017)
+++ trunk/src/wp-admin/includes/upgrade.php 2014-07-07 21:48:50 UTC (rev 29018)
</span><span class="lines">@@ -2159,7 +2159,7 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>-function wp_install_language_form( $body ) {
</del><ins>+function wp_install_language_form( $languages ) {
</ins><span class="cx"> echo "<fieldset>\n";
</span><span class="cx"> echo "<legend class='screen-reader-text'>Select a default language</legend>\n";
</span><span class="cx"> echo '<input type="radio" checked="checked" class="screen-reader-input" name="language" id="language_default" value="">';
</span><span class="lines">@@ -2167,14 +2167,14 @@
</span><span class="cx"> echo "\n";
</span><span class="cx">
</span><span class="cx"> if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && ( 'en_US' !== WPLANG ) ) {
</span><del>- if ( isset( $body['languages'][WPLANG] ) ) {
- $language = $body['languages'][WPLANG];
</del><ins>+ if ( isset( $languages[ WPLANG ] ) ) {
+ $language = $languages[ WPLANG ];
</ins><span class="cx"> echo '<input type="radio" name="language" checked="checked" class="' . esc_attr( $language['language'] ) . ' screen-reader-input" id="language_wplang" value="' . esc_attr( $language['language'] ) . '">';
</span><span class="cx"> echo '<label for="language_wplang">' . esc_html( $language['native_name'] ) . "</label>\n";
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- foreach ( $body['languages'] as $language ) {
</del><ins>+ foreach ( $languages as $language ) {
</ins><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><span class="lines">@@ -2183,9 +2183,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * @todo rename, move
</del><ins>+ * Gets available translations from the WordPress.org API.
+ *
+ * @since 4.0.0
+ *
+ * @return array Array of translations, each an array of data.
</ins><span class="cx"> */
</span><del>-function wp_get_available_translations() {
</del><ins>+function wp_get_available_translations_from_api() {
</ins><span class="cx"> $url = 'http://api.wordpress.org/translations/core/1.0/';
</span><span class="cx"> if ( wp_http_supports( array( 'ssl' ) ) ) {
</span><span class="cx"> $url = set_url_scheme( $url, 'https' );
</span><span class="lines">@@ -2199,72 +2203,80 @@
</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><del>- $languages = array();
- // Key the language array with the language code
- foreach ( $body['languages'] as $language ) {
- $languages[$language['language']] = $language;
</del><ins>+ $translations = array();
+ // Key the array with the language code for now
+ foreach ( $body['translations'] as $translation ) {
+ $translations[ $translation['language'] ] = $translation;
</ins><span class="cx"> }
</span><del>- $body['languages'] = $languages;
- return $body;
</del><ins>+ return $translations;
</ins><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * [wp_install_download_language_pack description]
- *
- * @param string $lang [description]
- * @return string|false [description]
</del><ins>+ * Downloads a language pack.
+ *
+ * @since 4.0.0
+ *
+ * @param string $download Language code to download.
+ * @return string|false Returns the language code if successfully downloaded
+ * (or already installed), or false on failure.
</ins><span class="cx"> */
</span><del>-function wp_install_download_language_pack( $lang ) {
- // Check if the language is already installed.
- $available_languages = get_available_languages();
- if ( in_array( $lang, $available_languages ) ) {
- return $lang;
</del><ins>+function wp_install_download_language_pack( $download ) {
+ // Check if the translation is already installed.
+ if ( in_array( $download, get_available_languages() ) ) {
+ return $download;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Confirm the language is one we can download.
- $body = wp_get_available_translations();
- $loading_language = false;
- if ( $body ) {
- foreach ( $body['languages'] as $language ) {
- if ( $language['language'] === $lang ) {
- $loading_language = $lang;
- break;
- }
</del><ins>+ // Confirm the translation is one we can download.
+ $translations = wp_get_available_translations_from_api();
+ if ( ! $translations ) {
+ return false;
+ }
+ foreach ( $translations as $translation ) {
+ if ( $translation['language'] === $download ) {
+ $translation_to_load = true;
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $loading_language ) {
</del><ins>+ if ( empty( $translation_to_load ) ) {
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- $language = (object) $language;
</del><ins>+ $translation = (object) $translation;
</ins><span class="cx">
</span><span class="cx"> require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
</span><span class="cx"> $skin = new Automatic_Upgrader_Skin;
</span><span class="cx"> $upgrader = new Language_Pack_Upgrader( $skin );
</span><del>- $language->type = 'core';
</del><ins>+ $translation->type = 'core';
</ins><span class="cx"> /**
</span><span class="cx"> * @todo failures (such as non-direct FS)
</span><span class="cx"> */
</span><del>- $upgrader->upgrade( $language, array( 'clear_update_cache' => false ) );
- return $language->language;
</del><ins>+ $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
+ return $translation->language;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function wp_install_load_language( $request ) {
- $loading_language = '';
- if ( ! empty( $request ) ) {
- $available_languages = get_available_languages();
- if ( in_array( $request, $available_languages ) ) {
- $loading_language = $request;
</del><ins>+/**
+ * Load a translation during the install process.
+ *
+ * @since 4.0.0
+ *
+ * @param string $translation Translation to load.
+ * @return string|false Returns the language code if successfully loaded,
+ * or false on failure.
+ */
+function wp_install_load_language( $translation ) {
+ if ( ! empty( $translation ) ) {
+ if ( in_array( $translation, get_available_languages() ) ) {
+ $translation_to_load = $translation;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $loading_language ) {
- load_textdomain( 'default', WP_LANG_DIR . "/{$loading_language}.mo" );
- load_textdomain( 'default', WP_LANG_DIR . "/admin-{$loading_language}.mo" );
- return $loading_language;
</del><ins>+ if ( empty( $translation_to_load ) ) {
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return false;
</del><ins>+ load_textdomain( 'default', WP_LANG_DIR . "/{$translation_to_load}.mo" );
+ load_textdomain( 'default', WP_LANG_DIR . "/admin-{$translation_to_load}.mo" );
+ return $translation_to_load;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/install.php (29017 => 29018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/install.php 2014-07-07 20:29:32 UTC (rev 29017)
+++ trunk/src/wp-admin/install.php 2014-07-07 21:48:50 UTC (rev 29018)
</span><span class="lines">@@ -179,10 +179,10 @@
</span><span class="cx"> switch($step) {
</span><span class="cx"> case 0: // Step 0
</span><span class="cx">
</span><del>- if ( empty( $_GET['language'] ) && ( $body = wp_get_available_translations() ) ) {
</del><ins>+ if ( empty( $_GET['language'] ) && ( $languages = wp_get_available_translations_from_api() ) ) {
</ins><span class="cx"> display_header( 'language-chooser' );
</span><span class="cx"> echo '<form id="setup" method="post" action="?step=1">';
</span><del>- wp_install_language_form( $body );
</del><ins>+ wp_install_language_form( $languages );
</ins><span class="cx"> echo '</form>';
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/setup-config.php (29017 => 29018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/setup-config.php 2014-07-07 20:29:32 UTC (rev 29017)
+++ trunk/src/wp-admin/setup-config.php 2014-07-07 21:48:50 UTC (rev 29018)
</span><span class="lines">@@ -86,10 +86,10 @@
</span><span class="cx"> switch($step) {
</span><span class="cx"> case -1:
</span><span class="cx">
</span><del>- if ( empty( $_GET['language'] ) && ( $body = wp_get_available_translations() ) ) {
</del><ins>+ if ( empty( $_GET['language'] ) && ( $languages = wp_get_available_translations_from_api() ) ) {
</ins><span class="cx"> setup_config_display_header( 'language-chooser' );
</span><span class="cx"> echo '<form id="setup" method="post" action="?step=0">';
</span><del>- wp_install_language_form( $body );
</del><ins>+ wp_install_language_form( $languages );
</ins><span class="cx"> echo '</form>';
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/version.php (29017 => 29018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/version.php 2014-07-07 20:29:32 UTC (rev 29017)
+++ trunk/src/wp-includes/version.php 2014-07-07 21:48:50 UTC (rev 29018)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global string $wp_version
</span><span class="cx"> */
</span><del>-$wp_version = '4.0-alpha-28611-src';
</del><ins>+$wp_version = '4.0-alpha-29018-src';
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span></span></pre>
</div>
</div>
</body>
</html>