Changeset 13425

Timestamp:

02/26/2010 05:46:08 AM (13 years ago)

Author:

nacin

Message:

A call to arms for grammarians. Fixes #12228 fixes #11875 props kurtmckee, filosofo, jjj

Location:

trunk

Files:

• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/options-general.php (modified) (3 diffs)
• wp-includes/class-smtp.php (modified) (1 diff)
• wp-includes/classes.php (modified) (2 diffs)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)

trunk/wp-admin/includes/misc.php

@@ -129 +129 @@
     $htaccess_file = $home_path.'.htaccess';
 
-    // If the file doesn't already exists check for write access to the directory and whether we have some rules.
+    // If the file doesn't already exist check for write access to the directory and whether we have some rules.
     // else check for write access to the file.
     if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {

trunk/wp-admin/includes/template.php

@@ -1823 +1823 @@
     if ( current_user_can( 'edit_user', $user_object->ID ) ) {
         // Set up the user editing link
-        // TODO: make profile/user-edit determination a seperate function
+        // TODO: make profile/user-edit determination a separate function
         if ($current_user->ID == $user_object->ID) {
             $edit_link = 'profile.php';

trunk/wp-admin/options-general.php

@@ -144 +144 @@
 <?php endif; ?>
 <br />
-<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>
+<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>
 </td>
 <?php
@@ -186 +186 @@
     <?php
     $now = localtime(time(),true);
-    if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.');
+    if ($now['tm_isdst']) _e('This timezone is currently in daylight saving time.');
     else _e('This timezone is currently in standard time.');
     ?>
@@ -203 +203 @@
             echo ' ';
             $message = $tr['isdst'] ?
-                __('Daylight savings time begins on: <code>%s</code>.') :
+                __('Daylight saving time begins on: <code>%s</code>.') :
                 __('Standard time begins  on: <code>%s</code>.');
             printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $tr['ts'] ) );
         } else {
-            _e('This timezone does not observe daylight savings time.');
+            _e('This timezone does not observe daylight saving time.');
         }
     }

trunk/wp-includes/class-smtp.php

@@ -266 +266 @@
    * that is to be send with the headers. Each header needs to be
    * on a single line followed by a <CRLF> with the message headers
-   * and the message body being seperated by and additional <CRLF>.
+   * and the message body being separated by and additional <CRLF>.
    *
    * Implements rfc 821: DATA <CRLF>

trunk/wp-includes/classes.php

@@ -923 +923 @@
         /*
          * need to display in hierarchical order
-         * seperate elements into two buckets: top level and children elements
+         * separate elements into two buckets: top level and children elements
          * children_elements is two dimensional array, eg.
          * children_elements[10][] contains all sub-elements whose parent is 10.
@@ -1037 +1037 @@
 
         /*
-         * seperate elements into two buckets: top level and children elements
+         * separate elements into two buckets: top level and children elements
          * children_elements is two dimensional array, eg.
          * children_elements[10][] contains all sub-elements whose parent is 10.

trunk/wp-includes/deprecated.php

@@ -1256 +1256 @@
  *
  * @param int $comment_ID The ID of the comment
- * @param int $no_cache Whether to use the cache (casted to bool)
+ * @param int $no_cache Whether to use the cache (cast to bool)
  * @param bool $include_unapproved Whether to include unapproved comments
  * @return array The comment data

trunk/wp-includes/general-template.php

@@ -168 +168 @@
  * Display the Log In/Out link.
  *
- * Displays a link, which allows the user to navigate to the Log In page to log in
+ * Displays a link, which allows users to navigate to the Log In page to log in
  * or log out depending on whether they are currently logged in.
  *

trunk/wp-includes/load.php

@@ -229 +229 @@
  *
  * WP_DEBUG_DISPLAY and WP_DEBUG_LOG perform no function unless WP_DEBUG is true.
- * WP_DEBUG defaults defaults to false.
+ * WP_DEBUG defaults to false.
  *
  * When WP_DEBUG is true, all PHP notices are reported. WordPress will also display

trunk/wp-includes/post-template.php

@@ -1007 +1007 @@
  *
  * This template tag allows you to determine if you are in a page template.
- * You can optional provide a template name and then the check will be
+ * You can optionally provide a template name and then the check will be
  * specific to that template.
  *