Plugin Name:',
- __( 'https://codex.wordpress.org/File_Header', 'wporg-plugins' )
+ __( 'https://developer.wordpress.org/plugins/plugin-basics/header-requirements/', 'wporg-plugins' )
) );
}
@@ -95,8 +95,7 @@
return new \WP_Error( 'unsupported_name', $error . ' ' . sprintf(
/* translators: %s: 'Plugin Name:' */
- __( 'Plugin names can only contain latin letters (A-z), numbers, spaces, and hyphens. Please change the %s line in your main plugin file and upload it again.', 'wporg-plugins' ),
- esc_html( $this->plugin['Name'] ),
+ __( 'Plugin names may only contain latin letters (A-z), numbers, spaces, and hyphens. Please change the %s line in your main plugin file and upload it again.', 'wporg-plugins' ),
'Plugin Name:'
) );
}
@@ -121,7 +120,7 @@
return new \WP_Error( 'already_exists', $error . ' ' . sprintf(
/* translators: 1: plugin slug, 2: 'Plugin Name:' */
- __( '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' ),
+ __( 'There is already a plugin with the name %1$s in the directory. Please rename your plugin by changing the %2$s line in your main plugin file and upload it again.', 'wporg-plugins' ),
'' . $this->plugin_slug . '',
'Plugin Name:'
) );
@@ -132,9 +131,10 @@
$error = __( 'Error: The plugin has already been submitted.', 'wporg-plugins' );
return new \WP_Error( 'already_submitted', $error . ' ' . sprintf(
- /* translators: 1: plugin slug, 2: plugins@wordpress.org */
- __( 'You have already submitted a plugin called %1$s. Please be patient and wait for a review. If you have made a mistake, email %2$s and let us know.', 'wporg-plugins' ),
+ /* translators: 1: plugin slug, 2: Documentation URL, 3: plugins@wordpress.org */
+ __( 'You have already submitted a plugin named %1$s. There is no need to resubmit existing plugins, even for new versions. Simply update your plugin within the directory via SVN. If you need assistance, email %2$s and let us know.', 'wporg-plugins' ),
'' . $this->plugin_slug . '',
+ __( 'https://developer.wordpress.org/plugins/wordpress-org/how-to-use-subversion/', 'wporg-plugins' ),
'plugins@wordpress.org'
) );
}
@@ -144,7 +144,7 @@
return new \WP_Error( 'no_description', $error . ' ' . sprintf(
/* translators: 1: plugin header line, 2: Documentation URL */
- __( 'Add a %1$s line to your main plugin file and upload the plugin again. Plugin Headers', 'wporg-plugins' ),
+ __( 'Add a %1$s line to your main plugin file and upload the plugin again. Please review our documentation on Plugin Headers for more information.', 'wporg-plugins' ),
'Description:',
__( 'https://developer.wordpress.org/plugins/the-basics/header-requirements/', 'wporg-plugins' )
) );
@@ -155,7 +155,7 @@
return new \WP_Error( 'no_version', $error . ' ' . sprintf(
/* translators: 1: plugin header line, 2: Documentation URL */
- __( 'Add a %1$s line to your main plugin file and upload the plugin again. Plugin Headers', 'wporg-plugins' ),
+ __( 'Add a %1$s line to your main plugin file and upload the plugin again. Please review our documentation on Plugin Headers for more information.', 'wporg-plugins' ),
'Version:',
__( 'https://developer.wordpress.org/plugins/the-basics/header-requirements/', 'wporg-plugins' )
) );
@@ -166,7 +166,7 @@
return new \WP_Error( 'invalid_version', $error . ' ' . sprintf(
/* translators: %s: 'Version:' */
- __( 'Version strings can only contain numeric and period characters (like 1.2). Please fix the %s line in your main plugin file and upload the plugin again.', 'wporg-plugins' ),
+ __( 'Version strings can only contain numeric and period characters (i.e. 1.2). Please correct the %s line in your main plugin file and upload the plugin again.', 'wporg-plugins' ),
'Version:'
) );
}
@@ -177,7 +177,7 @@
return new \WP_Error(
'plugin_author_uri', $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' )
+ __( 'A plugin URI (Unique Record Indicator) is a webpage that provides details about this specific plugin. An author URI is a webpage that provides information about the author of the plugin. Those two URIs must be different. You are not required to provide both, so pick the one that best applies to your situation.', 'wporg-plugins' )
);
}
@@ -187,7 +187,7 @@
return new \WP_Error( 'no_readme', $error . ' ' . sprintf(
/* translators: 1: readme.txt, 2: readme.md */
- __( 'The zip file must include a file named %1$s or %2$s. We recommend using %1$s as it will allow you to fully utilize our directory.', 'wporg-plugins' ),
+ __( 'The zip file must include a readme file named %1$s or %2$s. We recommend using %1$s as it will allow you to fully utilize our directory.', 'wporg-plugins' ),
'readme.txt',
'readme.md'
) );
@@ -202,7 +202,7 @@
$error = __( 'Error: The plugin has failed the automated checks.', 'wporg-plugins' );
return new \WP_Error( 'failed_checks', $error . ' ' . sprintf(
- /* translators: 1: Plugin Check Plugin URL, 2: make.wordpress.org/plugins */
+ /* translators: 1: Plugin Check Plugin URL, 2: make.wordpress.org/plugins (BAD URL!) */
__( 'Please correct the problems with the plugin and upload it again. You can also use the Plugin Check Plugin 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/',
'https://make.wordpress.org/plugins'
@@ -278,7 +278,7 @@
/* translators: 1: plugin name, 2: plugin slug, 3: plugins@wordpress.org */
$message = sprintf(
- __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. It has been given the initial plugin slug of %2$s, however that is subject to change based on the results of your code review.' ),
+ __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. It has been given the initial plugin slug of %2$s, however that is subject to change based on the results of your code review. If this slug is incorrect, please contact us immediatly, as it cannot be changed once your plugin is approved.' ),
esc_html( $this->plugin['Name'] ),
'' . $this->plugin_slug . ''
) . ''; @@ -289,8 +289,17 @@ 'plugins@wordpress.org' ) . '
'; - $message .= __( 'If there is any error in your submission, please email us as we can correct many issues before approval.', 'wporg-plugins' ) . '
'; + // Warn if the plugin starts with a reserved slug. + if ( $this->starts_with_reserved_slug() ) { + /* translators: 1: plugin name */ + $message .= sprintf( + __( 'Warning: Your plugin will probably need to be renamed. Your chosen plugin name - %1$s - starts with a term that may belong to another company. When we review your submision we will either correct this for you or request you approve a new name.' ), + esc_html( $this->plugin['Name'] ), + ) . '
'; + } + $message .= __( 'If there is any error in your submission, please email us as soon as possible. We can correct many issues before approval.', 'wporg-plugins' ) . '
'; + $message .= sprintf( /* translators: 1: URL to guidelines; 2: URL to FAQs; */ wp_kses_post( __( 'While you’re waiting on your review, please take the time to read the developer guidelines and the developer FAQ as they will address most questions.', 'wporg-plugins' ) ), @@ -330,6 +339,34 @@ } /** + * Whether the uploaded plugin uses a slug commonly abused by non reps + * + * @return bool + */ + public function starts_with_reserved_slug() { + $abused_slugs = array( + // Plugin Directory URL parameters. + 'apple', + 'facebook', + 'google', + 'ios', + 'jetpack', + 'microsoft', + 'paypal', + 'twitter', + 'woocommerce', + 'wordpress', + 'yoast', + ); + + // Get the slug in an array. + $slug = explode( '-', $this->plugin_slug ); + + // If the slug is the same as the first term, flag for abuse. + return in_array( $slug[0], $abused_slugs ); + } + + /** * Find the plugin readme file. * * Looks for either a readme.txt or readme.md file, prioritizing readme.txt. @@ -339,7 +376,7 @@ protected function find_readme_file() { $files = Filesystem::list_files( $this->plugin_root, false /* non-recursive */, '!^readme\.(txt|md)$!i' ); - // Prioritize readme.txt + // Prioritize readme.txt file. foreach ( $files as $file ) { if ( '.txt' === strtolower( substr( $file, -4 ) ) ) { return $file; @@ -358,7 +395,7 @@ return true; // Run the checks. // @todo Include plugin checker. - // pass $this->plugin_root as the plugin root + // pass $this->plugin_root as the plugin root. $result = true; // Display the errors. @@ -404,7 +441,7 @@ /* translators: %s: plugin name */ $email_subject = sprintf( - __( '[WordPress Plugin Directory] New Plugin - %s', 'wporg-plugins' ), + __( '[WordPress Plugin Directory] Successful Plugin Submission - %s', 'wporg-plugins' ), $this->plugin['Name'] ); @@ -415,9 +452,9 @@ Your plugin has been given the initial slug of %2$s, however this is subject to change based on the results of your review. -If there is any problem with this submission, please reply to this email and let us know right away. In most cases, we can correct errors as long as the plugin has not yet been approved. For situations like an incorrect plugin slug, we are unable to change that post approval, so if you do not let us know of your requirements now, we will be unable to honor them later. +If there is any problem with this submission, please reply to this email and let us know right away. In most cases, we can correct errors as long as the plugin has not yet been approved. For situations like an incorrect plugin slug, we are unable to change that post approval. If you do not inform us of any requirements now, we will be unable to honor them later. -We recommend you review the following links to understand the +We recommend you review the following links to understand the review process and our expectations: Guidelines: https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/ Frequently Asked Questions: https://developer.wordpress.org/plugins/wordpress-org/plugin-developer-faq/