
<!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>[15130] trunk/wp-admin/includes/file.php:

  More request_filesystem_credentials() string improvements.</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15130">15130</a></dd>

<dt>Author</dt> <dd>nacin</dd>

<dt>Date</dt> <dd>2010-06-03 18:58:41 +0000 (Thu, 03 Jun 2010)</dd>

</dl>


<h3>Log Message</h3>

<pre>More request_filesystem_credentials() string improvements.</pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminincludesfilephp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (15129 => 15130)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/includes/file.php        2010-06-03 18:55:52 UTC (rev 15129)

+++ trunk/wp-admin/includes/file.php        2010-06-03 18:58:41 UTC (rev 15130)

</span><span class="lines">@@ -965,13 +965,20 @@

</span><span class="cx"> &lt;?php screen_icon(); ?&gt;

</span><span class="cx"> &lt;h2&gt;&lt;?php _e('Connection Information') ?&gt;&lt;/h2&gt;

</span><span class="cx"> &lt;p&gt;&lt;?php

</span><ins>+        $label_user = __('Username');

+        $label_pass = __('Password');

</ins><span class="cx">         _e('To perform the requested action, WordPress needs to access to your web server.');

</span><span class="cx">         echo ' ';

</span><span class="cx">         if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {

</span><del>-                if ( isset( $types['ssh'] ) )

</del><ins>+                if ( isset( $types['ssh'] ) ) {

</ins><span class="cx">                         _e('Please enter your FTP or SSH credentials to proceed.');

</span><del>-                else

</del><ins>+                        $label_user = __('FTP/SSH Username');

+                        $label_pass = __('FTP/SSH Password');

+                } else {

</ins><span class="cx">                         _e('Please enter your FTP credentials to proceed.');

</span><ins>+                        $label_user = __('FTP Username');

+                        $label_pass = __('FTP Password');

+                }

</ins><span class="cx">                 echo ' ';

</span><span class="cx">         }

</span><span class="cx">         _e('If you do not remember your credentials, you should contact your web host.');

</span><span class="lines">@@ -983,12 +990,12 @@

</span><span class="cx"> &lt;/tr&gt;

</span><span class="cx"> 

</span><span class="cx"> &lt;tr valign=&quot;top&quot;&gt;

</span><del>-&lt;th scope=&quot;row&quot;&gt;&lt;label for=&quot;username&quot;&gt;&lt;?php _e('Username') ?&gt;&lt;/label&gt;&lt;/th&gt;

</del><ins>+&lt;th scope=&quot;row&quot;&gt;&lt;label for=&quot;username&quot;&gt;&lt;?php echo $label_user; ?&gt;&lt;/label&gt;&lt;/th&gt;

</ins><span class="cx"> &lt;td&gt;&lt;input name=&quot;username&quot; type=&quot;text&quot; id=&quot;username&quot; value=&quot;&lt;?php echo esc_attr($username) ?&gt;&quot;&lt;?php disabled( defined('FTP_USER') ); ?&gt; size=&quot;40&quot; /&gt;&lt;/td&gt;

</span><span class="cx"> &lt;/tr&gt;

</span><span class="cx"> 

</span><span class="cx"> &lt;tr valign=&quot;top&quot;&gt;

</span><del>-&lt;th scope=&quot;row&quot;&gt;&lt;label for=&quot;password&quot;&gt;&lt;?php _e('Password') ?&gt;&lt;/label&gt;&lt;/th&gt;

</del><ins>+&lt;th scope=&quot;row&quot;&gt;&lt;label for=&quot;password&quot;&gt;&lt;?php echo $label_pass; ?&gt;&lt;/label&gt;&lt;/th&gt;

</ins><span class="cx"> &lt;td&gt;&lt;input name=&quot;password&quot; type=&quot;password&quot; id=&quot;password&quot; value=&quot;&lt;?php if ( defined('FTP_PASS') ) echo '*****'; ?&gt;&quot;&lt;?php disabled( defined('FTP_PASS') ); ?&gt; size=&quot;40&quot; /&gt;&lt;/td&gt;

</span><span class="cx"> &lt;/tr&gt;

</span><span class="cx"> 

</span></span></pre>

</div>

</div>


</body>

</html>