<!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>[25652] trunk/src/wp-includes: Send back core translation information to the API.</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/25652">25652</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-09-30 19:46:15 +0000 (Mon, 30 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Send back core translation information to the API. Update wp_get_installed_translations() to work with core translations. see <a href="http://core.trac.wordpress.org/ticket/18200">#18200</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/l10n.php (25651 => 25652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/l10n.php 2013-09-30 00:29:19 UTC (rev 25651)
+++ trunk/src/wp-includes/l10n.php 2013-09-30 19:46:15 UTC (rev 25652)
</span><span class="lines">@@ -745,17 +745,22 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.7.0
</span><span class="cx"> *
</span><del>- * @param string $type What to search for. Accepts 'plugins', 'themes'.
</del><ins>+ * @param string $type What to search for. Accepts 'plugins', 'themes', 'core'.
</ins><span class="cx"> * @return array Array of language data.
</span><span class="cx"> */
</span><span class="cx"> function wp_get_installed_translations( $type ) {
</span><del>- if ( $type !== 'themes' && $type !== 'plugins' )
</del><ins>+ if ( $type !== 'themes' && $type !== 'plugins' && $type !== 'core' )
</ins><span class="cx"> return array();
</span><span class="cx">
</span><del>- if ( ! is_dir( WP_LANG_DIR ) || ! is_dir( WP_LANG_DIR . "/$type" ) )
</del><ins>+ $dir = 'core' === $type ? '' : "/$type";
+
+ if ( ! is_dir( WP_LANG_DIR ) )
</ins><span class="cx"> return array();
</span><span class="cx">
</span><del>- $files = scandir( WP_LANG_DIR . "/$type" );
</del><ins>+ if ( $dir && ! is_dir( WP_LANG_DIR . $dir ) )
+ return array();
+
+ $files = scandir( WP_LANG_DIR . $dir );
</ins><span class="cx"> if ( ! $files )
</span><span class="cx"> return array();
</span><span class="cx">
</span><span class="lines">@@ -766,11 +771,13 @@
</span><span class="cx"> continue;
</span><span class="cx"> if ( substr( $file, -3 ) !== '.po' )
</span><span class="cx"> continue;
</span><del>- if ( ! preg_match( '/(.*)-([A-Za-z_]{2,6}).po/', $file, $match ) )
</del><ins>+ if ( ! preg_match( '/(?:(.+)-)?([A-Za-z_]{2,6}).po/', $file, $match ) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> list( , $textdomain, $language ) = $match;
</span><del>- $language_data[ $textdomain ][ $language ] = wp_get_pomo_file_data( WP_LANG_DIR . "/$type/$file" );
</del><ins>+ if ( '' === $textdomain )
+ $textdomain = 'default';
+ $language_data[ $textdomain ][ $language ] = wp_get_pomo_file_data( WP_LANG_DIR . "$dir/$file" );
</ins><span class="cx"> }
</span><span class="cx"> return $language_data;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/update.php (25651 => 25652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/update.php 2013-09-30 00:29:19 UTC (rev 25651)
+++ trunk/src/wp-includes/update.php 2013-09-30 19:46:15 UTC (rev 25652)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx"> $php_version = phpversion();
</span><span class="cx">
</span><span class="cx"> $current = get_site_transient( 'update_core' );
</span><ins>+ $translations = wp_get_installed_translations( 'core' );
+
</ins><span class="cx"> if ( ! is_object($current) ) {
</span><span class="cx"> $current = new stdClass;
</span><span class="cx"> $current->updates = array();
</span><span class="lines">@@ -85,10 +87,13 @@
</span><span class="cx"> 'headers' => array(
</span><span class="cx"> 'wp_install' => $wp_install,
</span><span class="cx"> 'wp_blog' => home_url( '/' )
</span><del>- )
</del><ins>+ ),
+ 'body' => array(
+ 'translations' => json_encode( $translations ),
+ ),
</ins><span class="cx"> );
</span><span class="cx">
</span><del>- $response = wp_remote_get($url, $options);
</del><ins>+ $response = wp_remote_post( $url, $options );
</ins><span class="cx">
</span><span class="cx"> if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -119,6 +124,10 @@
</span><span class="cx"> $updates->updates = $offers;
</span><span class="cx"> $updates->last_checked = time();
</span><span class="cx"> $updates->version_checked = $wp_version;
</span><ins>+
+ if ( isset( $body['translations'] ) )
+ $updates->translations = $body['translations'];
+
</ins><span class="cx"> set_site_transient( 'update_core', $updates);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>