From 8d9cf65725584fd55960e00a643f25dfbf5daa96 Mon Sep 17 00:00:00 2001
From: nacin
Date: Thu, 2 Dec 2010 23:30:21 +0000
Subject: [PATCH] s/occured/occurred/. props aldenta, fixes #15653.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/admin-ajax.php | 4 ++--
wp-admin/includes/class-wp-upgrader.php | 2 +-
wp-admin/includes/theme.php | 4 ++--
wp-app.php | 6 +++---
wp-includes/class-simplepie.php | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index d11e6abbf2..51e9d59560 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -508,7 +508,7 @@ case 'add-tag' :
$tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );
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();
@@ -1343,7 +1343,7 @@ case 'save-widget' :
$sidebar_id = $_POST['sidebar'];
$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 = '' . __('An error has occured. Please reload the page and try again.') . '
';
+ $error = '' . __('An error has occurred. Please reload the page and try again.') . '
';
$sidebars = wp_get_sidebars_widgets();
$sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array();
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 8b5cf4cc69..417bfcb9b2 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -1081,7 +1081,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
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: %2$s.');
+ $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: %2$s.');
$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
$this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' '.__('Show Details').''.__('Hide Details').'.';
$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index dd33604b49..1fa77e0645 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -389,11 +389,11 @@ function themes_api($action, $args = null) {
if ( ! $res ) {
$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.
Try again'), $request->get_error_message() );
+ $res = new WP_Error('themes_api_failed', __('An Unexpected HTTP Error occurred during the API request.
Try again'), $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']);
}
}
//var_dump(array($args, $res));
diff --git a/wp-app.php b/wp-app.php
index 2eaf6195e7..6de5288206 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -712,7 +712,7 @@ EOD;
$filetype = wp_check_filetype($location);
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
@unlink($location);
@@ -749,7 +749,7 @@ EOD;
$filetype = wp_check_filetype($location);
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');
header('Content-Type: ' . $entry['post_mime_type']);
@@ -801,7 +801,7 @@ EOD;
$location = "{$upload_dir['basedir']}/{$location}";
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");
$localfp = fopen($location, "w+");
diff --git a/wp-includes/class-simplepie.php b/wp-includes/class-simplepie.php
index 98843f03d3..275033a822 100644
--- a/wp-includes/class-simplepie.php
+++ b/wp-includes/class-simplepie.php
@@ -1831,7 +1831,7 @@ class SimplePie
}
/**
- * Return the error message for the occured error
+ * Return the error message for the occurred error
*
* @access public
* @return string Error message