Changeset 42811 for branches/4.9/src/wp-includes/script-loader.php

Timestamp:

03/09/2018 12:14:20 AM (7 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:

• . (modified) (1 prop)
• src/wp-includes/script-loader.php (modified) (4 diffs)

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

@@ -131 +131 @@
     did_action( 'init' ) && $scripts->localize( 'wp-ajax-response', 'wpAjax', array(
         'noPerm' => __('Sorry, you are not allowed to do that.'),
-        'broken' => __('An unidentified error has occurred.')
+        'broken' => __('Something went wrong.')
     ) );
 
@@ -563 +563 @@
         'action'             => __( 'Action' ),
         'discardChanges'     => __( 'Discard changes' ),
-        'cheatin'            => __( 'Cheatin’ uh?' ),
+        'cheatin'            => __( 'Something went wrong.' ),
+        'notAllowedHeading'  => __( 'You need a higher level of permission.' ),
         'notAllowed'         => __( 'Sorry, you are not allowed to customize this site.' ),
         'previewIframeTitle' => __( 'Site Preview' ),
@@ -642 +643 @@
         did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
             'noPerm' => __('Sorry, you are not allowed to do that.'),
-            'broken' => __('An unidentified error has occurred.')
+            'broken' => __('Something went wrong.')
         ));
 
@@ -836 +837 @@
                 /* translators: %s: Importer name */
                 'activateImporterLabel'      => __( 'Run %s' ),
-                'unknownError'               => __( 'An unidentified error has occurred.' ),
+                'unknownError'               => __( 'Something went wrong.' ),
                 'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
                 'nonceError'                 => __( 'An error has occurred. Please reload the page and try again.' ),