Changeset 41713 for trunk/src/wp-admin/includes/plugin.php

Timestamp:

10/03/2017 05:12:41 PM (7 years ago)

Author:

johnbillion

Message:

Plugins: Introduce a singular and plural form for the plugin deletion error message.

Props eddhurst, SergeyBiryukov

Fixes #38918

File:

• trunk/src/wp-admin/includes/plugin.php (modified) (1 diff)

trunk/src/wp-admin/includes/plugin.php

@@ -892 +892 @@
     }
 
-    if ( ! empty($errors) )
-        return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+    if ( ! empty( $errors ) ) {
+        if ( 1 === count( $errors ) ) {
+            /* translators: %s: plugin filename */
+            $message = __( 'Could not fully remove the plugin %s.' );
+        } else {
+            /* translators: %s: comma-separated list of plugin filenames */
+            $message = __( 'Could not fully remove the plugins %s.' );
+        }
+
+        return new WP_Error( 'could_not_remove_plugin', sprintf( $message, implode( ', ', $errors ) ) );
+    }
 
     return true;