WordPress.org

Make WordPress Core


Ignore:
Timestamp:
03/09/2018 12:14:20 AM (2 years ago)
Author:
SergeyBiryukov
Message:

General: Replace Cheatin’ uh? with friendlier error messages.

While intended as a playful error message, Cheatin’ uh? can be interpreted as insulting or accusatory in an already stressful situation. This replaces Cheatin’ with more meaningful error messages, depending on the error that occurs.

Props ElectricFeet, EricMeyer, karmatosed, dd32, BandonRandon, melchoyce, kristastevens for language; dmsnell for original patch; peterwilsoncc.
Merged [42648] and [42719] to the 4.9 branch.
Fixes #38332.

Location:
branches/4.9
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.9

  • branches/4.9/src/wp-includes/script-loader.php

    r42548 r42811  
    131131    did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
    132132        'noPerm' => __('Sorry, you are not allowed to do that.'),
    133         'broken' => __('An unidentified error has occurred.')
     133        'broken' => __('Something went wrong.')
    134134    ) );
    135135
     
    563563        'action'             => __( 'Action' ),
    564564        'discardChanges'     => __( 'Discard changes' ),
    565         'cheatin'            => __( 'Cheatin’ uh?' ),
     565        'cheatin'            => __( 'Something went wrong.' ),
     566        'notAllowedHeading'  => __( 'You need a higher level of permission.' ),
    566567        'notAllowed'         => __( 'Sorry, you are not allowed to customize this site.' ),
    567568        'previewIframeTitle' => __( 'Site Preview' ),
     
    642643        did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
    643644            'noPerm' => __('Sorry, you are not allowed to do that.'),
    644             'broken' => __('An unidentified error has occurred.')
     645            'broken' => __('Something went wrong.')
    645646        ));
    646647
     
    836837                /* translators: %s: Importer name */
    837838                'activateImporterLabel'      => __( 'Run %s' ),
    838                 'unknownError'               => __( 'An unidentified error has occurred.' ),
     839                'unknownError'               => __( 'Something went wrong.' ),
    839840                'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
    840841                'nonceError'                 => __( 'An error has occurred. Please reload the page and try again.' ),
Note: See TracChangeset for help on using the changeset viewer.