<!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>[12535] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php: Plugin Directory: Locale Banner: Improve strings for suggesting multiple languages.</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 { white-space: pre-line; 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/12535">12535</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/12535","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ryelle</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-04-12 20:05:53 +0000 (Wed, 12 Apr 2023)</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: Locale Banner: Improve strings for suggesting multiple languages.
When more than one language is suggested, the string now reads as a list, to avoid implying a hierarchy in the suggestions.
This brings over the changes in [dotorg-20224] to the plugin locale banner.
Fixes <a href="http://meta.trac.wordpress.org/ticket/6600">#6600</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>
</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 2023-04-12 05:32:20 UTC (rev 12534)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php 2023-04-12 20:05:53 UTC (rev 12535)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,81 +118,37 @@
</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"> // Only one locale suggestion.
</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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $suggest_named_locales ) ) {
+ $primary_locale = key( $suggest_named_locales );
+ // Load translations for wp_sprintf_l().
+ add_filter( 'wp_sprintf_l', function( $translations ) use( $primary_locale ) {
+ $translations['between'] = sprintf( $this->translate( '%1$s, %2$s', $primary_locale ), '', '' );
+ $translations['between_last_two'] = sprintf( $this->translate( '%1$s, and %2$s', $primary_locale ), '', '' );
+ $translations['between_only_two'] = sprintf( $this->translate( '%1$s and %2$s', $primary_locale ), '', '' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $is_plugin_request ) {
- $suggest_string = sprintf(
- $this->translate( 'This plugin is also available in %1$s. <a href="%2$s">Help improve the translation!</a>', $locale ),
- sprintf(
- '<a href="https://%s.wordpress.org%s">%s</a>',
- $locale_subdomain_assoc[ $locale ]->subdomain,
- esc_url( $current_path ),
- $language
- ),
- esc_url( 'https://translate.wordpress.org/projects/wp-plugins/' . $plugin_slug )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $translations;
+ } );
+
+ $suggestions = array();
+ foreach ( $suggest_named_locales as $locale => $language ) {
+ $suggestions[] = sprintf(
+ '<a href="https://%s.wordpress.org%s">%s</a>',
+ $locale_subdomain_assoc[ $locale ]->subdomain,
+ esc_url( $current_path ),
+ $language
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $suggest_string = sprintf(
- $this->translate( 'The plugin directory is also available in %s.', $locale ),
- sprintf(
- '<a href="https://%s.wordpress.org%s">%s</a>',
- $locale_subdomain_assoc[ $locale ]->subdomain,
- esc_url( $current_path ),
- $language
- )
- );
</del><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">- // Multiple locale suggestions.
- } elseif ( ! empty( $suggest_named_locales ) ) {
- $primary_locale = key( $suggest_named_locales );
- $primary_language = current( $suggest_named_locales );
- array_shift( $suggest_named_locales );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $is_plugin_request ) {
</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%s/">%s</a>, ',
- $locale_subdomain_assoc[ $locale ]->subdomain,
- esc_url( $current_path ),
- $language
- );
- }
-
</del><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">- $this->translate( 'This plugin is also available in %1$s (also: %2$s). <a href="%3$s">Help improve the translation!</a>', $primary_locale ),
- sprintf(
- '<a href="https://%s.wordpress.org%s">%s</a>',
- $locale_subdomain_assoc[ $primary_locale ]->subdomain,
- esc_url( $current_path ),
- $primary_language
- ),
- trim( $other_suggest, ' ,' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->translate( 'This plugin is also available in %1$s. <a href="%2$s">Help improve the translation!</a>', $primary_locale ),
+ wp_sprintf_l( '%l', $suggestions ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( 'https://translate.wordpress.org/projects/wp-plugins/' . $plugin_slug )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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%s">%s</a>, ',
- $locale_subdomain_assoc[ $locale ]->subdomain,
- esc_url( $current_path ),
- $language
- );
- }
-
</del><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">- $this->translate( 'The plugin directory is also available in %1$s (also: %2$s).', $primary_locale ),
- sprintf(
- '<a href="https://%s.wordpress.org%s">%s</a>',
- $locale_subdomain_assoc[ $primary_locale ]->subdomain,
- esc_url( $current_path ),
- $primary_language
- ),
- trim( $other_suggest, ' ,' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->translate( 'The plugin directory is also available in %s.', $primary_locale ),
+ wp_sprintf_l( '%l', $suggestions ),
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,10 +304,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $strings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 5118332 => 'This plugin is also available in %1$s. <a href="%2$s">Help improve the translation!</a>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 5118333 => 'This plugin is also available in %1$s (also: %2$s). <a href="%3$s">Help improve the translation!</a>',
</del><span class="cx" style="display: block; padding: 0 10px"> 2984795 => 'This plugin is not translated into %1$s yet. <a href="%2$s">Help translate it!</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> 3004513 => 'The plugin directory is also available in %s.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 3004514 => 'The plugin directory is also available in %1$s (also: %2$s).',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // These are in wp/dev
+ 7233895 => '%1$s, %2$s',
+ 7234333 => '%1$s, and %2$s',
+ 7960 => '%1$s and %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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -366,7 +325,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return isset( $cache[ $gp_locale ] ) ? $cache[ $gp_locale ] : $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">- // Magic number: 348841 is meta/plugins-v3.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Magic number: 348841 is meta/plugins-v3, 2 is wp/dev.
</ins><span class="cx" style="display: block; padding: 0 10px"> $translations = $wpdb->get_results( $wpdb->prepare( "
</span><span class="cx" style="display: block; padding: 0 10px"> SELECT
</span><span class="cx" style="display: block; padding: 0 10px"> locale as gp_locale, translation_0 as translation
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +333,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> JOIN translate_translations t
</span><span class="cx" style="display: block; padding: 0 10px"> ON ts.id = t.translation_set_id
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- project_id = 348841 AND slug = 'default' AND t.status = 'current'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ project_id IN ( 2, 348841 ) AND slug = 'default' AND t.status = 'current'
</ins><span class="cx" style="display: block; padding: 0 10px"> AND original_id = %d
</span><span class="cx" style="display: block; padding: 0 10px"> ", $original_id ), OBJECT_K );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,13 +349,9 @@
</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"> // Strings for the POT file.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* translators: %s: native language name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* translators: %s: native language name, possibly comma-separated list. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'This plugin is also available in %1$s. <a href="%2$s">Help improve the translation!</a>', 'wporg-plugins' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* translators: 1: native language name, 2: other native language names, comma separated */
-__( 'This plugin is also available in %1$s (also: %2$s). <a href="%3$s">Help improve the translation!</a>', 'wporg-plugins' );
</del><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 translated into %1$s yet. <a href="%2$s">Help translate it!</a>', 'wporg-plugins' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* translators: %s: native language name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* translators: %s: native language name, possibly comma-separated list. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'The plugin directory is also available in %s.', 'wporg-plugins' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* 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' );
</del></span></pre>
</div>
</div>
</body>
</html>