<!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>[48520] trunk/src: I18N: Add context to some plugin and theme strings for consistency.</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="https://core.trac.wordpress.org/changeset/48520">48520</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48520","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-20 23:12:33 +0000 (Mon, 20 Jul 2020)</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'>I18N: Add context to some plugin and theme strings for consistency.
Props ramiy, audrasjb.
Fixes <a href="https://core.trac.wordpress.org/ticket/50710">#50710</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueswpupdatesjs">trunk/src/js/_enqueues/wp/updates.js</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesdeprecatedphp">trunk/src/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueswpupdatesjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/updates.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/updates.js 2020-07-20 21:23:26 UTC (rev 48519)
+++ trunk/src/js/_enqueues/wp/updates.js 2020-07-20 23:12:33 UTC (rev 48520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,8 +813,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'aria-label',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Plugin name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _x( 'Install %s now', 'plugin' ),
- pluginName
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _x( 'Install %s now', 'plugin' ),
+ pluginName
</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"> .text( __( 'Install Now' ) );
</span></span></pre></div>
<a id="trunksrcwpadminimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/import.php 2020-07-20 21:23:26 UTC (rev 48519)
+++ trunk/src/wp-admin/import.php 2020-07-20 23:12:33 UTC (rev 48520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $plugin_slug ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $data[0] ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Importer name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Install %s now' ), $data[0] ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( _x( 'Install %s now', 'plugin' ), $data[0] ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Install Now' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2020-07-20 21:23:26 UTC (rev 48519)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2020-07-20 23:12:33 UTC (rev 48520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,7 +528,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $plugin['slug'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $status['url'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Plugin name and version. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Install %s now' ), $name ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( _x( 'Install %s now', 'plugin' ), $name ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $name ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Install Now' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,7 +550,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $plugin['slug'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $status['url'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Plugin name and version. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Update %s now' ), $name ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( _x( 'Update %s now', 'plugin' ), $name ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $name ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Update Now' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2020-07-20 21:23:26 UTC (rev 48519)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2020-07-20 23:12:33 UTC (rev 48520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +323,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<a class="install-now" href="%s" title="%s">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Install %s' ), $name ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( _x( 'Install %s', 'theme' ), $name ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'Install Now' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre></div>
<a id="trunksrcwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/deprecated.php 2020-07-20 21:23:26 UTC (rev 48519)
+++ trunk/src/wp-admin/includes/deprecated.php 2020-07-20 23:12:33 UTC (rev 48520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1379,7 +1379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<li class="dashboard-news-plugin"><span>' . __( 'Popular Plugin' ) . ':</span> ' . esc_html( $raw_title ) .
</span><span class="cx" style="display: block; padding: 0 10px"> ' <a href="' . $ilink . '" class="thickbox open-plugin-details-modal" aria-label="' .
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Plugin name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Install %s' ), $raw_title ) ) . '">(' . __( 'Install' ) . ')</a></li>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( _x( 'Install %s', 'plugin' ), $raw_title ) ) . '">(' . __( 'Install' ) . ')</a></li>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $feed->__destruct();
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $feed );
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2020-07-20 21:23:26 UTC (rev 48519)
+++ trunk/src/wp-admin/includes/theme.php 2020-07-20 23:12:33 UTC (rev 48520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'aria-label="%s" id="update-theme" data-slug="%s"',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme_name ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $stylesheet
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2020-07-20 21:23:26 UTC (rev 48519)
+++ trunk/src/wp-admin/includes/update.php 2020-07-20 23:12:33 UTC (rev 48520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +509,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class="update-link" aria-label="%s"',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Plugin name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Update %s now' ), $plugin_name ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( _x( 'Update %s now', 'plugin' ), $plugin_name ) )
</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"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -694,7 +694,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'class="update-link" aria-label="%s"',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( sprintf( __( 'Update %s now' ), $theme['Name'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( sprintf( _x( 'Update %s now', 'theme' ), $theme['Name'] ) )
</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>
<a id="trunksrcwpadminthemeinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-install.php 2020-07-20 21:23:26 UTC (rev 48519)
+++ trunk/src/wp-admin/theme-install.php 2020-07-20 23:12:33 UTC (rev 48520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +323,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.compatible_wp && data.compatible_php ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $aria_label = sprintf( __( 'Install %s' ), '{{ data.name }}' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $aria_label = sprintf( _x( 'Install %s', 'theme' ), '{{ data.name }}' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}" href="{{ data.install_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Install' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Theme name. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $aria_label = sprintf( __( 'Cannot Install %s' ), '{{ data.name }}' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $aria_label = sprintf( _x( 'Cannot Install %s', 'theme' ), '{{ data.name }}' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button button-primary disabled" data-name="{{ data.name }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _ex( 'Cannot Install', 'theme' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <button class="button disabled"><?php _e( 'Preview' ); ?></button>
</span></span></pre>
</div>
</div>
</body>
</html>