Changeset 16699

Timestamp:

12/02/2010 11:30:21 PM (14 years ago)

Author:

nacin

Message:

s/occured/occurred/. props aldenta, fixes #15653.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (2 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-app.php (modified) (3 diffs)
• wp-includes/class-simplepie.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -509 +509 @@
 
     if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
-        $message = __('An error has occured. Please reload the page and try again.');
+        $message = __('An error has occurred. Please reload the page and try again.');
         if ( is_wp_error($tag) && $tag->get_error_message() )
             $message = $tag->get_error_message();
@@ -1344 +1344 @@
     $multi_number = !empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0;
     $settings = isset($_POST['widget-' . $id_base]) && is_array($_POST['widget-' . $id_base]) ? $_POST['widget-' . $id_base] : false;
-    $error = '<p>' . __('An error has occured. Please reload the page and try again.') . '</p>';
+    $error = '<p>' . __('An error has occurred. Please reload the page and try again.') . '</p>';
 
     $sidebars = wp_get_sidebars_widgets();

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -1082 +1082 @@
     function add_strings() {
         $this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
-        $this->upgrader->strings['skin_update_failed_error'] = __('An error occured while updating %1$s: <strong>%2$s</strong>.');
+        $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: <strong>%2$s</strong>.');
         $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
         $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span>.</a>';

trunk/wp-admin/includes/theme.php

@@ -390 +390 @@
         $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) );
         if ( is_wp_error($request) ) {
-            $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occured during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );
+            $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.</p> <p><a href="?" onclick="document.location.reload(); return false;">Try again</a>'), $request->get_error_message() );
         } else {
             $res = unserialize($request['body']);
             if ( ! $res )
-            $res = new WP_Error('themes_api_failed', __('An unknown error occured'), $request['body']);
+            $res = new WP_Error('themes_api_failed', __('An unknown error occurred'), $request['body']);
         }
     }

trunk/wp-app.php

@@ -713 +713 @@
 
         if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) )
-            $this->internal_error(__('Error ocurred while accessing post metadata for file location.'));
+            $this->internal_error(__('Error occurred while accessing post metadata for file location.'));
 
         // delete file
@@ -750 +750 @@
 
         if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) )
-            $this->internal_error(__('Error ocurred while accessing post metadata for file location.'));
+            $this->internal_error(__('Error occurred while accessing post metadata for file location.'));
 
         status_header('200');
@@ -802 +802 @@
 
         if (!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']))
-            $this->internal_error(__('Error ocurred while accessing post metadata for file location.'));
+            $this->internal_error(__('Error occurred while accessing post metadata for file location.'));
 
         $fp = fopen("php://input", "rb");

trunk/wp-includes/class-simplepie.php

@@ -1832 +1832 @@
 
     /**
-     * Return the error message for the occured error
+     * Return the error message for the occurred error
      *
      * @access public