<!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>[3534] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-translations.php: Plugin Directory: Enhance logic for the locale banner.</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/3534">3534</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/3534","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 10:19:36 +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: Enhance logic for the locale banner.
* Show suggestions for other languages only in the English directory.
* Translate banner into the first language.
* Tweak the strings.
See <a href="http://meta.trac.wordpress.org/ticket/1728">#1728</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclassplugintranslationsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-translations.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryapiroutesclassplugintranslationsphp"></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-plugin-translations.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-plugin-translations.php 2016-06-22 10:13:29 UTC (rev 3533)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-translations.php 2016-06-22 10:19:36 UTC (rev 3534)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,71 +63,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Build a list of WordPress locales which we'll suggest to the user.
</span><span class="cx" style="display: block; padding: 0 10px"> $suggest_locales = array_values( array_intersect( $translated_locales, $locales_from_header ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_locale_is_suggested = in_array( $current_locale, $suggest_locales );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $current_locale_is_suggested ) {
- $suggest_locales = array_diff( $suggest_locales, [ $current_locale ] );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_locale_is_translated = in_array( $current_locale, $translated_locales );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the native language names of the locales.
</span><span class="cx" style="display: block; padding: 0 10px"> $suggest_named_locales = [];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $suggest_locales as $locale ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slug = str_replace( '_', '-', $locale );
- $slug = strtolower( $slug );
- $name = $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM languages WHERE slug = %s', $slug ) );
- if ( ! $name ) {
- $fallback_slug = explode( '-', $slug )[0]; // de-de => de
- $name = $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM languages WHERE slug = %s', $fallback_slug ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = $this->get_native_language_name( $locale );
+ if ( $name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suggest_named_locales[ $locale ] = $name;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $suggest_named_locales[ $locale ] = $name;
</del><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 class="cx" style="display: block; padding: 0 10px"> $suggest_string = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 === count( $suggest_named_locales ) ) {
- $locale = key( $suggest_named_locales );
- $language = current( $suggest_named_locales );
- $suggest_string = sprintf(
- /* translators: %s: native language name. */
- __( 'This plugin is also available in %s.', 'wporg-plugins' ),
- sprintf(
- '<a href="https://%s.wordpress.org/plugins-wp/%s/">%s</a>',
- $locale_subdomain_assoc[ $locale ]->subdomain,
- $plugin_slug,
- $language
- )
- );
- } elseif ( ! empty( $suggest_named_locales ) ) {
- $primary_locale = key( $suggest_named_locales );
- $primary_language = current( $suggest_named_locales );
- array_shift( $suggest_named_locales );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'en_US' === $current_locale ) {
+ if ( 1 === count( $suggest_named_locales ) ) {
+ $locale = key( $suggest_named_locales );
+ $language = current( $suggest_named_locales );
+ $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
+ )
+ );
+ } elseif ( ! empty( $suggest_named_locales ) ) {
+ $primary_locale = key( $suggest_named_locales );
+ $primary_language = current( $suggest_named_locales );
+ array_shift( $suggest_named_locales );
</ins><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">+ $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><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $current_locale_is_suggested && ! $current_locale_is_translated ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suggest_string = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: native language name, 2: native language names */
- __( 'This plugin is also available in %1$s (also: %2$s).', 'wporg-plugins' ),
- 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><ins style="background-color: #dfd; text-decoration:none; 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 ),
+ $this->get_native_language_name( $current_locale ),
+ esc_url( 'https://translate.wordpress.org/projects/wp-plugins/' . $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">- } elseif ( 'en_US' !== $current_locale && ! $current_locale_is_suggested ) {
- $suggest_string = sprintf(
- /* translators: %s: URL to translate.wordpress.org */
- __( 'This plugin is not yet available in your language. <a href="%s">Can you help translating it?</a>', 'wporg-translate' ),
- 'https://translate.wordpress.org/projects/wp-plugins/' . $plugin_slug
- );
</del><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"> $result = [
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,4 +227,82 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Translates a string into a language.
+ *
+ * @param string $string The string to translate.
+ * @param string $wp_locale A WP locale of a language.
+ *
+ * @return mixed
+ */
+ protected function translate( $string, $wp_locale ) {
+ global $wpdb;
+
+ $strings = array(
+ 2984793 => 'This plugin is also available in %s.',
+ 2984794 => 'This plugin is also available in %1$s (also: %2$s).',
+ 2984795 => 'This plugin is not available in %1$s yet. <a href="%2$s">Help translate it!</a>',
+ );
+
+ $original_id = array_search( $string, $strings, true );
+
+ require_once GLOTPRESS_LOCALES_PATH;
+ $gp_locale = \GP_Locales::by_field( 'wp_locale', $wp_locale )->slug;
+
+ $cache = wp_cache_get( 'original-' . $original_id, 'lang-guess-translations' );
+ if ( false !== $cache ) {
+ return isset( $cache[ $gp_locale ] ) ? $cache[ $gp_locale ] : $string;
+ }
+
+ // Magic number: 348841 is meta/plugins-v3.
+ $translations = $wpdb->get_results( $wpdb->prepare( "
+ SELECT
+ locale as gp_locale, translation_0 as translation
+ FROM translate_translation_sets ts
+ JOIN translate_translations t
+ ON ts.id = t.translation_set_id
+ WHERE
+ project_id = 348841 AND slug = 'default' AND t.status = 'current'
+ AND original_id = %d
+ ", $original_id ), OBJECT_K );
+
+ foreach ( $translations as &$translation ) {
+ $translation = $translation->translation;
+ }
+ unset( $translation );
+
+ # wp_cache_add( 'original-' . $original_id, $translations, 'lang-guess-translations', 900 );
+
+ return isset( $translations[ $gp_locale ] ) ? $translations[ $gp_locale ] : $string;
+ }
+
+ protected function get_native_language_name( $locale ) {
+ global $wpdb;
+
+ $slug = str_replace( '_', '-', $locale );
+ $slug = strtolower( $slug );
+
+ $name = $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM languages WHERE slug = %s', $slug ) );
+ if ( ! $name ) {
+ $fallback_slug = explode( '-', $slug )[0]; // de-de => de
+ $name = $wpdb->get_var( $wpdb->prepare( 'SELECT name FROM languages WHERE slug = %s', $fallback_slug ) );
+ if ( $name ) {
+ return $name;
+ }
+ } else {
+ return $name;
+ }
+
+ return '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+// Strings for the POT file.
+
+/* translators: %s: native language name. */
+__( 'This plugin is also available in %s.', 'wporg-plugins' );
+/* translators: 1: native language name, 2: other native language names, comma separated */
+__( 'This plugin is also available in %1$s (also: %2$s).', 'wporg-plugins' );
+/* translators: 1: native language name, 2: URL to translate.wordpress.org */
+__( 'This plugin is not available in %1$s yet. <a href="%2$s">Help translate it!</a>', 'wporg-plugins' );
</ins></span></pre>
</div>
</div>
</body>
</html>