Changeset 5392

Timestamp:

04/20/2017 03:27:59 PM (8 years ago)

Author:

ocean90

Message:

Plugin Directory: Use a consistent wording for upload error messages.

Props SergeyBiryukov.
Fixes #2757.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php (modified) (7 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

@@ -76 +76 @@
             $error = __( 'The plugin has no name.', 'wporg-plugins' );
 
-            /* translators: 1: comment header line, 2: Codex URL */
+            /* translators: 1: plugin header line, 2: Codex URL */
             return $error . ' ' . sprintf( __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
                 '<code>Plugin Name:</code>',
@@ -88 +88 @@
         // Make sure it doesn't use a slug deemed not to be used by the public.
         if ( $this->has_reserved_slug() ) {
-            /* translators: %s: plugin slug */
-            return sprintf( __( 'Sorry, the plugin name %s is reserved for use by WordPress. Please change the name of your plugin and upload it again.', 'wporg-plugins' ),
-                '<code>' . $this->plugin_slug . '</code>'
+            /* translators: 1: plugin slug, 2: 'Plugin Name:' */
+            return sprintf( __( 'Sorry, the plugin name %1%s is reserved for use by WordPress. Please change the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ),
+                '<code>' . $this->plugin_slug . '</code>',
+                '<code>Plugin Name:</code>'
             );
         }
@@ -98 +99 @@
         // Is there already a plugin by a different author?
         if ( $plugin_post && $plugin_post->post_author != get_current_user_id() ) {
-            /* translators: %s: plugin slug */
-            return sprintf( __( 'There is already a plugin called %s by a different author. Please change the name of your plugin in the plugin header file and upload it again.', 'wporg-plugins' ),
-                '<code>' . $this->plugin_slug . '</code>'
+            /* translators: 1: plugin slug, 2: 'Plugin Name:' */
+            return sprintf( __( 'There is already a plugin called %1$s by a different author. Please change the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ),
+                '<code>' . $this->plugin_slug . '</code>',
+                '<code>Plugin Name:</code>'
             );
         }
@@ -106 +108 @@
         // Check the plugin can accept uploads (New submissions, or pending further review).
         if ( $plugin_post && ! in_array( $plugin_post->post_status, array( 'new', 'pending' ) ) ) {
-            /* translators: %s: plugin slug */
-            return sprintf( __( 'There is already a plugin called %s. Please change the name of your plugin in the plugin header file and upload it again.', 'wporg-plugins' ),
-                '<code>' . $this->plugin_slug . '</code>'
+            /* translators: 1: plugin slug, 2: 'Plugin Name:' */
+            return sprintf( __( 'There is already a plugin called %1$s. Please change the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ),
+                '<code>' . $this->plugin_slug . '</code>',
+                '<code>Plugin Name:</code>'
             );
         }
@@ -115 +118 @@
             $error = __( 'The plugin has no description.', 'wporg-plugins' );
 
-            /* translators: 1: comment header line, 2: Codex URL */
+            /* translators: 1: plugin header line, 2: Codex URL */
             return $error . ' ' . sprintf( __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
                 '<code>Description:</code>',
@@ -125 +128 @@
             $error = __( 'The plugin has no version.', 'wporg-plugins' );
 
-            /* translators: 1: comment header line, 2: Codex URL */
+            /* translators: 1: plugin header line, 2: Codex URL */
             return $error . ' ' . sprintf( __( 'Add a %1$s line to your main plugin file and upload the plugin again. <a href="%2$s">Plugin Headers</a>', 'wporg-plugins' ),
                 '<code>Version:</code>',
@@ -133 +136 @@
 
         if ( preg_match( '|[^\d\.]|', $this->plugin['Version'] ) ) {
-            /* translators: %s: Version header */
+            /* translators: %s: 'Version:' */
             return sprintf( __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix your %s line in your main plugin file and upload the plugin again.', 'wporg-plugins' ),
                 '<code>Version:</code>'