<!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>[13425] trunk: A call to arms for grammarians.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13425">13425</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-26 05:46:08 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>A call to arms for grammarians. Fixes <a href="http://trac.wordpress.org/ticket/12228">#12228</a> fixes <a href="http://trac.wordpress.org/ticket/11875">#11875</a> props kurtmckee, filosofo, jjj</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpincludesclasssmtpphp">trunk/wp-includes/class-smtp.php</a></li>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (13424 => 13425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2010-02-26 04:53:30 UTC (rev 13424)
+++ trunk/wp-admin/includes/misc.php 2010-02-26 05:46:08 UTC (rev 13425)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> $home_path = get_home_path();
</span><span class="cx"> $htaccess_file = $home_path.'.htaccess';
</span><span class="cx">
</span><del>- // If the file doesn't already exists check for write access to the directory and whether we have some rules.
</del><ins>+ // If the file doesn't already exist check for write access to the directory and whether we have some rules.
</ins><span class="cx"> // else check for write access to the file.
</span><span class="cx"> if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
</span><span class="cx"> if ( got_mod_rewrite() ) {
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (13424 => 13425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-02-26 04:53:30 UTC (rev 13424)
+++ trunk/wp-admin/includes/template.php 2010-02-26 05:46:08 UTC (rev 13425)
</span><span class="lines">@@ -1822,7 +1822,7 @@
</span><span class="cx"> // Check if the user for this row is editable
</span><span class="cx"> if ( current_user_can( 'edit_user', $user_object->ID ) ) {
</span><span class="cx"> // Set up the user editing link
</span><del>- // TODO: make profile/user-edit determination a seperate function
</del><ins>+ // TODO: make profile/user-edit determination a separate function
</ins><span class="cx"> if ($current_user->ID == $user_object->ID) {
</span><span class="cx"> $edit_link = 'profile.php';
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (13424 => 13425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-02-26 04:53:30 UTC (rev 13424)
+++ trunk/wp-admin/options-general.php 2010-02-26 05:46:08 UTC (rev 13425)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> <span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n($time_format)); ?></span>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <br />
</span><del>-<span class="description"><?php _e('Unfortunately, you have to manually update this for Daylight Savings Time. Lame, we know, but will be fixed in the future.'); ?></span>
</del><ins>+<span class="description"><?php _e('Unfortunately, you have to manually update this for daylight saving time. Lame, we know, but will be fixed in the future.'); ?></span>
</ins><span class="cx"> </td>
</span><span class="cx"> <?php
</span><span class="cx"> else: // looks like we can do nice timezone selection!
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> <?php if ($check_zone_info && $tzstring) : ?>
</span><span class="cx"> <?php
</span><span class="cx"> $now = localtime(time(),true);
</span><del>- if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.');
</del><ins>+ if ($now['tm_isdst']) _e('This timezone is currently in daylight saving time.');
</ins><span class="cx"> else _e('This timezone is currently in standard time.');
</span><span class="cx"> ?>
</span><span class="cx"> <br />
</span><span class="lines">@@ -202,11 +202,11 @@
</span><span class="cx"> if ( isset($found) && $found === true ) {
</span><span class="cx"> echo ' ';
</span><span class="cx"> $message = $tr['isdst'] ?
</span><del>- __('Daylight savings time begins on: <code>%s</code>.') :
</del><ins>+ __('Daylight saving time begins on: <code>%s</code>.') :
</ins><span class="cx"> __('Standard time begins on: <code>%s</code>.');
</span><span class="cx"> printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $tr['ts'] ) );
</span><span class="cx"> } else {
</span><del>- _e('This timezone does not observe daylight savings time.');
</del><ins>+ _e('This timezone does not observe daylight saving time.');
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesclasssmtpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-smtp.php (13424 => 13425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-smtp.php 2010-02-26 04:53:30 UTC (rev 13424)
+++ trunk/wp-includes/class-smtp.php 2010-02-26 05:46:08 UTC (rev 13425)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> * finializing the mail transaction. $msg_data is the message
</span><span class="cx"> * that is to be send with the headers. Each header needs to be
</span><span class="cx"> * on a single line followed by a <CRLF> with the message headers
</span><del>- * and the message body being seperated by and additional <CRLF>.
</del><ins>+ * and the message body being separated by and additional <CRLF>.
</ins><span class="cx"> *
</span><span class="cx"> * Implements rfc 821: DATA <CRLF>
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (13424 => 13425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-02-26 04:53:30 UTC (rev 13424)
+++ trunk/wp-includes/classes.php 2010-02-26 05:46:08 UTC (rev 13425)
</span><span class="lines">@@ -922,7 +922,7 @@
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * need to display in hierarchical order
</span><del>- * seperate elements into two buckets: top level and children elements
</del><ins>+ * separate elements into two buckets: top level and children elements
</ins><span class="cx"> * children_elements is two dimensional array, eg.
</span><span class="cx"> * children_elements[10][] contains all sub-elements whose parent is 10.
</span><span class="cx"> */
</span><span class="lines">@@ -1036,7 +1036,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * seperate elements into two buckets: top level and children elements
</del><ins>+ * separate elements into two buckets: top level and children elements
</ins><span class="cx"> * children_elements is two dimensional array, eg.
</span><span class="cx"> * children_elements[10][] contains all sub-elements whose parent is 10.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (13424 => 13425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2010-02-26 04:53:30 UTC (rev 13424)
+++ trunk/wp-includes/deprecated.php 2010-02-26 05:46:08 UTC (rev 13425)
</span><span class="lines">@@ -1255,7 +1255,7 @@
</span><span class="cx"> * @see get_comment()
</span><span class="cx"> *
</span><span class="cx"> * @param int $comment_ID The ID of the comment
</span><del>- * @param int $no_cache Whether to use the cache (casted to bool)
</del><ins>+ * @param int $no_cache Whether to use the cache (cast to bool)
</ins><span class="cx"> * @param bool $include_unapproved Whether to include unapproved comments
</span><span class="cx"> * @return array The comment data
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (13424 => 13425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-02-26 04:53:30 UTC (rev 13424)
+++ trunk/wp-includes/general-template.php 2010-02-26 05:46:08 UTC (rev 13425)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Display the Log In/Out link.
</span><span class="cx"> *
</span><del>- * Displays a link, which allows the user to navigate to the Log In page to log in
</del><ins>+ * Displays a link, which allows users to navigate to the Log In page to log in
</ins><span class="cx"> * or log out depending on whether they are currently logged in.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (13424 => 13425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-02-26 04:53:30 UTC (rev 13424)
+++ trunk/wp-includes/load.php 2010-02-26 05:46:08 UTC (rev 13425)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> * defined in wp-config.php. Example: <code> define( 'WP_DEBUG', true ); </code>
</span><span class="cx"> *
</span><span class="cx"> * WP_DEBUG_DISPLAY and WP_DEBUG_LOG perform no function unless WP_DEBUG is true.
</span><del>- * WP_DEBUG defaults defaults to false.
</del><ins>+ * WP_DEBUG defaults to false.
</ins><span class="cx"> *
</span><span class="cx"> * When WP_DEBUG is true, all PHP notices are reported. WordPress will also display
</span><span class="cx"> * notices, including one when a deprecated WordPress function, function argument,
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (13424 => 13425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-02-26 04:53:30 UTC (rev 13424)
+++ trunk/wp-includes/post-template.php 2010-02-26 05:46:08 UTC (rev 13425)
</span><span class="lines">@@ -1006,7 +1006,7 @@
</span><span class="cx"> * Whether currently in a page template.
</span><span class="cx"> *
</span><span class="cx"> * This template tag allows you to determine if you are in a page template.
</span><del>- * You can optional provide a template name and then the check will be
</del><ins>+ * You can optionally provide a template name and then the check will be
</ins><span class="cx"> * specific to that template.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span></span></pre>
</div>
</div>
</body>
</html>