Changeset 5471

Timestamp:

05/03/2017 10:38:30 PM (7 years ago)

Author:

tellyworth

Message:

Plugin directory: clarify error messages during submission process. Props @ipstenu.

Fixes #2788

File:

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

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

@@ -88 +88 @@
         // Make sure it doesn't use a slug deemed not to be used by the public.
         if ( $this->has_reserved_slug() ) {
+            $error = __( 'The plugin has a reserved name.', 'wporg-plugins' );
+            
             /* 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' ),
+            return $error . ' ' . sprintf( __( 'Your chosen plugin name - %1$s - has been 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>'
@@ -99 +101 @@
         // Is there already a plugin with the same slug by a different author?
         if ( $plugin_post && $plugin_post->post_author != get_current_user_id() ) {
+            $error = __( 'The plugin already exists.', 'wporg-plugins' );
+            
             /* 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' ),
+            return $error . ' ' . 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>'
@@ -108 +112 @@
         // Is there already a plugin with the same slug by the same author?
         if ( $plugin_post ) {
-            /* 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>'
+            $error = __( 'The plugin has already been submitted.', 'wporg-plugins' );
+            
+            /* translators: %s: plugin slug */
+            return $error . ' ' . sprintf( __( 'You have already submitted a plugin called %s. Please be patient and wait for a review. If you have made a mistake, please email plugins@wordpress.org and let us know.', 'wporg-plugins' ),
+                '<code>' . $this->plugin_slug . '</code>'
             );
         }
@@ -136 +141 @@
 
         if ( preg_match( '|[^\d\.]|', $this->plugin['Version'] ) ) {
+            $error = __( 'The plugin has an invalid version.', 'wporg-plugins' );
+            
             /* 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' ),
+            return $error . ' ' . 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>'
             );
@@ -144 +151 @@
         // Prevent duplicate URLs.
         if ( ! empty( $this->plugin['PluginURI'] ) && ! empty( $this->plugin['AuthorURI'] ) && $this->plugin['PluginURI'] == $this->plugin['AuthorURI'] ) {
-            return __( 'Duplicate plugin and author URLs. A plugin URL is a page/site that provides details about this specific plugin. An author URL is a page/site that provides information about the author of the plugin. You aren&rsquo;t required to provide both, so pick the one that best applies to your URL.', 'wporg-plugins' );
+            $error = __( 'The plugin has duplicate plugin and author URLs.', 'wporg-plugins' );
+            
+            return $error . ' ' . __( 'A plugin URL is a page/site that provides details about this specific plugin. An author URL is a page/site that provides information about the author of the plugin. You are not required to provide both, so pick the one that best applies to your URL.', 'wporg-plugins' );
         }
 
         $readme = $this->find_readme_file();
         if ( empty( $readme ) ) {
+            $error = __( 'The plugin is missing a readme.', 'wporg-plugins' );
+            
             /* translators: 1: readme.txt, 2: readme.md */
-            return sprintf( __( 'The zip file must include a file named %1$s or %2$s.', 'wporg-plugins' ),
+            return $error . ' ' . sprintf( __( 'The zip file must include a file named %1$s or %2$s.', 'wporg-plugins' ),
                 '<code>readme.txt</code>',
                 '<code>readme.md</code>'
@@ -158 +169 @@
 
         // Pass it through Plugin Check and see how great this plugin really is.
+        // We're not actually using this right now
         $result = $this->check_plugin();
 
         if ( ! $result ) {
+            $error = __( 'The plugin has failed the automated checks.', 'wporg-plugins' );
+            
             /* translators: 1: Plugin Check Plugin URL, 2: make.wordpress.org/plugins */
-            return sprintf( __( 'Your plugin has failed the plugin check. Please correct the problems with it and upload it again. You can also use the <a href="%1$s">Plugin Check Plugin</a> to test your plugin before uploading. If you have any questions about this please post them to %2$s.', 'wporg-plugins' ),
+            return $error . ' ' . sprintf( __( 'Please correct the problems with it and upload it again. You can also use the <a href="%1$s">Plugin Check Plugin</a> to test your plugin before uploading. If you have any questions about this please post them to %2$s.', 'wporg-plugins' ),
                 '//wordpress.org/plugins/plugin-check/',
                 '<a href="https://make.wordpress.org/plugins">https://make.wordpress.org/plugins</a>'
@@ -237 +251 @@
         // Success!
         /* translators: 1: plugin name */
-        return sprintf( __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. We&rsquo;ve sent you an email verifying that we&rsquo;ve received it.', 'wporg-plugins' ),
+        return sprintf( __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. We&rsquo;ve sent you an email verifying this submission. Please make sure to whitelist our email address - plugins@wordpress.org - to ensure you receive all our communications.', 'wporg-plugins' ),
             esc_html( $this->plugin['Name'] )
         );
@@ -347 +361 @@
 
         /* translators: 1: plugin name, 2: Trac ticket URL */
-        $email_content = sprintf( __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. If your plugin is selected to be part of the directory we\'ll send a follow up email.
+        $email_content = sprintf( __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. If your plugin is selected to be part of the directory we\'ll send a follow up email. If there is a problem with your plugin submission, such as an incorrect display name or slug, please reply to this email and let us know.
 
 --