<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14173] trunk/wp-admin/includes/class-wp-upgrader.php: Upgrader i18n fixes:
  add translator messages,
  take tags out of a message and use the correct error text when including both the title and the error message</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14173">14173</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2010-04-21 10:58:06 +0000 (Wed, 21 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Upgrader i18n fixes: add translator messages, take tags out of a message and use the correct error text when including both the title and the error message</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (14172 => 14173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php        2010-04-20 17:40:08 UTC (rev 14172)
+++ trunk/wp-admin/includes/class-wp-upgrader.php        2010-04-21 10:58:06 UTC (rev 14173)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx">                 $this-&gt;strings['fs_no_content_dir'] = __('Unable to locate WordPress Content directory (wp-content).');
</span><span class="cx">                 $this-&gt;strings['fs_no_plugins_dir'] = __('Unable to locate WordPress Plugin directory.');
</span><span class="cx">                 $this-&gt;strings['fs_no_themes_dir'] = __('Unable to locate WordPress Theme directory.');
</span><ins>+                /* translators: %s: directory name */
</ins><span class="cx">                 $this-&gt;strings['fs_no_folder'] = __('Unable to locate needed folder (%s).');
</span><span class="cx"> 
</span><span class="cx">                 $this-&gt;strings['download_failed'] = __('Download failed.');
</span><span class="lines">@@ -1055,7 +1056,7 @@
</span><span class="cx">         function add_strings() {
</span><span class="cx">                 $this-&gt;upgrader-&gt;strings['skin_update_failed_error'] = __('An error occured while updating %1$s: &lt;strong&gt;%2$s&lt;/strong&gt;.');
</span><span class="cx">                 $this-&gt;upgrader-&gt;strings['skin_update_failed'] = __('The update of %1$s failed.');
</span><del>-                $this-&gt;upgrader-&gt;strings['skin_update_successful'] = __('%1$s updated successfully. &lt;a onclick=&quot;%2$s&quot; href=&quot;#&quot; class=&quot;hide-if-no-js&quot;&gt;&lt;span&gt;Show Details&lt;/span&gt;&lt;span class=&quot;hidden&quot;&gt;Hide Details&lt;/span&gt;.&lt;/a&gt;');
</del><ins>+                $this-&gt;upgrader-&gt;strings['skin_update_successful'] = __('%1$s updated successfully.').' &lt;a onclick=&quot;%2$s&quot; href=&quot;#&quot; class=&quot;hide-if-no-js&quot;&gt;&lt;span&gt;'.__('Show Details').'&lt;/span&gt;&lt;span class=&quot;hidden&quot;&gt;'.__('Hide Details').'&lt;/span&gt;.&lt;/a&gt;';
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function feedback($string) {
</span><span class="lines">@@ -1109,7 +1110,7 @@
</span><span class="cx">                 echo '&lt;/p&gt;&lt;/div&gt;';
</span><span class="cx">                 if ( $this-&gt;error || ! $this-&gt;result ) {
</span><span class="cx">                         if ( $this-&gt;error )
</span><del>-                                echo '&lt;div class=&quot;error&quot;&gt;&lt;p&gt;' . sprintf($this-&gt;upgrader-&gt;strings['skin_update_failed'], $title, $this-&gt;error) . '&lt;/p&gt;&lt;/div&gt;';
</del><ins>+                                echo '&lt;div class=&quot;error&quot;&gt;&lt;p&gt;' . sprintf($this-&gt;upgrader-&gt;strings['skin_update_failed_error'], $title, $this-&gt;error) . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">                         else
</span><span class="cx">                                 echo '&lt;div class=&quot;error&quot;&gt;&lt;p&gt;' . sprintf($this-&gt;upgrader-&gt;strings['skin_update_failed'], $title) . '&lt;/p&gt;&lt;/div&gt;';
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>