<!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>[3559] sites/trunk/wordpress.org/public_html/wp-content: Plugin Directory: Display a locale banner on non-plugin details pages.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3559">3559</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3559","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-22 16:06:56 +0000 (Wed, 22 Jun 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Display a locale banner on non-plugin details pages.
See <a href="http://meta.trac.wordpress.org/ticket/1728">#1728</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasslocalebannerphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsjslocalebannerjs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/locale-banner.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclasslocalebannerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php 2016-06-22 15:36:29 UTC (rev 3558)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php 2016-06-22 16:06:56 UTC (rev 3559)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,21 +41,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Retrieve all the WordPress locales.
</span><span class="cx" style="display: block; padding: 0 10px"> $all_locales = wp_list_pluck( $locale_subdomain_assoc, 'locale' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get the active language packs of the plugin.
- $language_packs = $wpdb->get_results( $wpdb->prepare( "
- SELECT *
- FROM language_packs
- WHERE
- type = 'plugin' AND
- domain = %s AND
- active = 1
- GROUP BY language",
- $plugin_slug
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_plugin_request = ! empty( $plugin_slug );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Retrieve all the WordPress locales in which the plugin is translated.
- $translated_locales = wp_list_pluck( $language_packs, 'language' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_plugin_request ) {
+ // Get the active language packs of the plugin.
+ $language_packs = $wpdb->get_results( $wpdb->prepare( "
+ SELECT *
+ FROM language_packs
+ WHERE
+ type = 'plugin' AND
+ domain = %s AND
+ active = 1
+ GROUP BY language",
+ $plugin_slug
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Retrieve all the WordPress locales in which the plugin is translated.
+ $translated_locales = wp_list_pluck( $language_packs, 'language' );
+ } else {
+ $translated_locales = $all_locales;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get the WordPress locales based on the HTTP accept language header.
</span><span class="cx" style="display: block; padding: 0 10px"> $locales_from_header = $this->get_locale_from_header( $all_locales );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,44 +84,77 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $suggest_string = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'en_US' === $current_locale ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 === count( $suggest_named_locales ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $locale = key( $suggest_named_locales );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locale = key( $suggest_named_locales );
</ins><span class="cx" style="display: block; padding: 0 10px"> $language = current( $suggest_named_locales );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $suggest_string = sprintf(
- $this->translate( 'This plugin is also available in %s.', $locale ),
- sprintf(
- '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>',
- $locale_subdomain_assoc[ $locale ]->subdomain,
- $plugin_slug,
- $language
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $is_plugin_request ) {
+ $suggest_string = sprintf(
+ $this->translate( 'This plugin is also available in %s.', $locale ),
+ sprintf(
+ '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>',
+ $locale_subdomain_assoc[ $locale ]->subdomain,
+ $plugin_slug,
+ $language
+ )
+ );
+ } else {
+ $suggest_string = sprintf(
+ $this->translate( 'The plugin directory is also available in %s.', $locale ),
+ sprintf(
+ '<a href="https://%s.wordpress.org/plugins-wp/">%s</a>',
+ $locale_subdomain_assoc[ $locale ]->subdomain,
+ $language
+ )
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $suggest_named_locales ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $primary_locale = key( $suggest_named_locales );
</span><span class="cx" style="display: block; padding: 0 10px"> $primary_language = current( $suggest_named_locales );
</span><span class="cx" style="display: block; padding: 0 10px"> array_shift( $suggest_named_locales );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $other_suggest = '';
- foreach ( $suggest_named_locales as $locale => $language ) {
- $other_suggest .= sprintf(
- '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>, ',
- $locale_subdomain_assoc[ $locale ]->subdomain,
- $plugin_slug,
- $language
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $is_plugin_request ) {
+ $other_suggest = '';
+ foreach ( $suggest_named_locales as $locale => $language ) {
+ $other_suggest .= sprintf(
+ '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>, ',
+ $locale_subdomain_assoc[ $locale ]->subdomain,
+ $plugin_slug,
+ $language
+ );
+ }
+
+ $suggest_string = sprintf(
+ $this->translate( 'This plugin is also available in %1$s (also: %2$s).', $primary_locale ),
+ sprintf(
+ '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>',
+ $locale_subdomain_assoc[ $primary_locale ]->subdomain,
+ $plugin_slug,
+ $primary_language
+ ),
+ trim( $other_suggest, ' ,' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $other_suggest = '';
+ foreach ( $suggest_named_locales as $locale => $language ) {
+ $other_suggest .= sprintf(
+ '<a href="https://%s.wordpress.org/plugins-wp/">%s</a>, ',
+ $locale_subdomain_assoc[ $locale ]->subdomain,
+ $language
+ );
+ }
+
+ $suggest_string = sprintf(
+ $this->translate( 'The plugin directory is also available in %1$s (also: %2$s).', $primary_locale ),
+ sprintf(
+ '<a href="https://%s.wordpress.org/plugins-wp/">%s</a>',
+ $locale_subdomain_assoc[ $primary_locale ]->subdomain,
+ $primary_language
+ ),
+ trim( $other_suggest, ' ,' )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $suggest_string = sprintf(
- $this->translate( 'This plugin is also available in %1$s (also: %2$s).', $primary_locale ),
- sprintf(
- '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>',
- $locale_subdomain_assoc[ $primary_locale ]->subdomain,
- $plugin_slug,
- $primary_language
- ),
- trim( $other_suggest, ' ,' )
- );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! $current_locale_is_suggested && ! $current_locale_is_translated ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $current_locale_is_suggested && ! $current_locale_is_translated && $is_plugin_request ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suggest_string = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> $this->translate( 'This plugin is not available in %1$s yet. <a href="%2$s">Help translate it!</a>', $current_locale ),
</span><span class="cx" style="display: block; padding: 0 10px"> $this->get_native_language_name( $current_locale ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,9 +286,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 2984793 => 'This plugin is also available in %s.',
</span><span class="cx" style="display: block; padding: 0 10px"> 2984794 => 'This plugin is also available in %1$s (also: %2$s).',
</span><span class="cx" style="display: block; padding: 0 10px"> 2984795 => 'This plugin is not available in %1$s yet. <a href="%2$s">Help translate it!</a>',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0 => 'The plugin directory is also available in %s.',
+ 0 => 'The plugin directory is also available in %1$s (also: %2$s).',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original_id = array_search( $string, $strings, true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $original_id ) {
+ return $string;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once GLOTPRESS_LOCALES_PATH;
</span><span class="cx" style="display: block; padding: 0 10px"> $gp_locale = \GP_Locales::by_field( 'wp_locale', $wp_locale )->slug;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,3 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'This plugin is also available in %1$s (also: %2$s).', 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: native language name, 2: URL to translate.wordpress.org */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'This plugin is not available in %1$s yet. <a href="%2$s">Help translate it!</a>', 'wporg-plugins' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* translators: %s: native language name. */
+__( 'The plugin directory is also available in %s.', 'wporg-plugins' );
+/* translators: 1: native language name, 2: other native language names, comma separated */
+__( 'The plugin directory is also available in %1$s (also: %2$s).', 'wporg-plugins' );
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php 2016-06-22 15:36:29 UTC (rev 3558)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php 2016-06-22 16:06:56 UTC (rev 3559)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,13 +74,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular( 'plugin' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'wporg-plugins-accordion', get_template_directory_uri() . '/js/section-accordion.js', array(), '20160525', true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_script( 'wporg-plugins-locale-banner', get_template_directory_uri() . '/js/locale-banner.js', array(), '20160622', true );
- wp_localize_script( 'wporg-plugins-locale-banner', 'wporgLocaleBanner', array(
- 'apiURL' => rest_url( '/plugins/v1/locale-banner' ),
- 'currentPlugin' => get_queried_object()->post_name,
- ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_script( 'wporg-plugins-locale-banner', get_template_directory_uri() . '/js/locale-banner.js', array(), '20160622', true );
+ wp_localize_script( 'wporg-plugins-locale-banner', 'wporgLocaleBanner', array(
+ 'apiURL' => rest_url( '/plugins/v1/locale-banner' ),
+ 'currentPlugin' => is_singular( 'plugin' ) ? get_queried_object()->post_name : '',
+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\scripts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsjslocalebannerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/locale-banner.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/locale-banner.js 2016-06-22 15:36:29 UTC (rev 3558)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/locale-banner.js 2016-06-22 16:06:56 UTC (rev 3559)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,14 +1,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global wporgLocaleBanner */
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.ajax({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.ajax( {
</ins><span class="cx" style="display: block; padding: 0 10px"> type: 'POST',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- url : wporgLocaleBanner.apiURL,
- dataType : 'json',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ url: wporgLocaleBanner.apiURL,
+ dataType: 'json',
</ins><span class="cx" style="display: block; padding: 0 10px"> data: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin_slug' : wporgLocaleBanner.currentPlugin
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin_slug': wporgLocaleBanner.currentPlugin
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- success : function( response ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ success: function ( response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! response.suggest_string ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'html': response.suggest_string
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.plugin-header' ).after( $banner );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $( 'body' ).hasClass( 'single-plugin' ) ) {
+ $( '.plugin-header' ).after( $banner );
+ } else {
+ $( '.site-main' ).prepend( $banner );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>