WordPress.org

Make WordPress Core

Changeset 16699


Ignore:
Timestamp:
12/02/10 23:30:21 (3 years ago)
Author:
nacin
Message:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-ajax.php

    r16617 r16699  
    509509 
    510510    if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) { 
    511         $message = __('An error has occured. Please reload the page and try again.'); 
     511        $message = __('An error has occurred. Please reload the page and try again.'); 
    512512        if ( is_wp_error($tag) && $tag->get_error_message() ) 
    513513            $message = $tag->get_error_message(); 
     
    13441344    $multi_number = !empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0; 
    13451345    $settings = isset($_POST['widget-' . $id_base]) && is_array($_POST['widget-' . $id_base]) ? $_POST['widget-' . $id_base] : false; 
    1346     $error = '<p>' . __('An error has occured. Please reload the page and try again.') . '</p>'; 
     1346    $error = '<p>' . __('An error has occurred. Please reload the page and try again.') . '</p>'; 
    13471347 
    13481348    $sidebars = wp_get_sidebars_widgets(); 
  • trunk/wp-admin/includes/class-wp-upgrader.php

    r16696 r16699  
    10821082    function add_strings() { 
    10831083        $this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.'); 
    1084         $this->upgrader->strings['skin_update_failed_error'] = __('An error occured while updating %1$s: <strong>%2$s</strong>.'); 
     1084        $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: <strong>%2$s</strong>.'); 
    10851085        $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.'); 
    10861086        $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

    r16696 r16699  
    390390        $request = wp_remote_post('http://api.wordpress.org/themes/info/1.0/', array( 'body' => array('action' => $action, 'request' => serialize($args))) ); 
    391391        if ( is_wp_error($request) ) { 
    392             $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() ); 
     392            $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() ); 
    393393        } else { 
    394394            $res = unserialize($request['body']); 
    395395            if ( ! $res ) 
    396             $res = new WP_Error('themes_api_failed', __('An unknown error occured'), $request['body']); 
     396            $res = new WP_Error('themes_api_failed', __('An unknown error occurred'), $request['body']); 
    397397        } 
    398398    } 
  • trunk/wp-app.php

    r16221 r16699  
    713713 
    714714        if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) ) 
    715             $this->internal_error(__('Error ocurred while accessing post metadata for file location.')); 
     715            $this->internal_error(__('Error occurred while accessing post metadata for file location.')); 
    716716 
    717717        // delete file 
     
    750750 
    751751        if ( !isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext']) ) 
    752             $this->internal_error(__('Error ocurred while accessing post metadata for file location.')); 
     752            $this->internal_error(__('Error occurred while accessing post metadata for file location.')); 
    753753 
    754754        status_header('200'); 
     
    802802 
    803803        if (!isset($location) || 'attachment' != $entry['post_type'] || empty($filetype['ext'])) 
    804             $this->internal_error(__('Error ocurred while accessing post metadata for file location.')); 
     804            $this->internal_error(__('Error occurred while accessing post metadata for file location.')); 
    805805 
    806806        $fp = fopen("php://input", "rb"); 
  • trunk/wp-includes/class-simplepie.php

    r13935 r16699  
    18321832 
    18331833    /** 
    1834      * Return the error message for the occured error 
     1834     * Return the error message for the occurred error 
    18351835     * 
    18361836     * @access public 
Note: See TracChangeset for help on using the changeset viewer.