Ticket #5939: 5939.2.diff

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

@@ -121 +121 @@
                                 // Trademarks that do NOT end in "-" indicate slug cannot contain term at all.
                                 $message = sprintf(
                                         /* translators: 1: plugin slug, 2: trademarked term, 3: 'Plugin Name:', 4: plugin email address */
-                                        __( 'Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used at all in your plugin permalink nor the display name. To proceed with this submission you must remove "%2$s" from the %3$s line in both your main plugin file and readme entirely. Once you\'ve finished, you may upload the plugin again. Do not attempt to work around this by removing letters (i.e. WordPess) or using numbers (4 instead of A). Those are seen as intentional actions to avoid trademark laws, and are not permitted. If you feel this is in error, such as you legally own the trademarked term, please email us at %4$s and explain why.', 'wporg-plugins' ),
+                                        __( 'Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used at all in your plugin permalink nor the display name. Per the requirements of trademark owners and law, we disallow the use of certain terms in ways that are infringing and/or misleading. To proceed with this submission you must remove "%2$s" from the %3$s line in both your main plugin file and readme entirely. Once you\'ve finished, you may upload the plugin again. Do not attempt to work around this by removing letters (i.e. WordPess) or using numbers (4 instead of A). Those are seen as intentional actions to avoid trademark laws, and are not permitted. If you feel this is in error, such as you legally own the trademarked term, please email us at %4$s and explain why.', 'wporg-plugins' ),
                                         '<code>' . $this->plugin_slug . '</code>',
                                         trim( $this->has_trademarked_slug(), '-' ),
                                         '<code>Plugin Name:</code>',
@@ -131 +131 @@
                                 // Trademarks ending in "-" indicate slug cannot BEGIN with that term.
                                 $message = sprintf(
                                         /* translators: 1: plugin slug, 2: trademarked term, 3: 'Plugin Name:', 4: plugin email address */
-                                        __( 'Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used to begin your permalink or display name. Per the requirements of trademark owners and law, we disallow the use of certain terms in ways that are infringing and/or misleading. In order to proceed with this submission, you must change the %3$s line in your main plugin file and readme to end with  "-%2$s" instead. Once you\'ve finished, you may upload the plugin again. If you feel this is in error, such as you legally own the trademarked term, please email us at %4$s and explain why.', 'wporg-plugins' ),
+                                        __( 'Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used to begin your permalink or display name. Per the requirements of trademark owners and law, we disallow the use of certain terms in ways that are infringing and/or misleading. In order to proceed with this submission, you must change the %3$s line in your main plugin file and readme to end with "%2$s" instead. Once you\'ve finished, you may upload the plugin again. If you feel this is in error, such as you legally own the trademarked term, please email us at %4$s and explain why.', 'wporg-plugins' ),
                                         '<code>' . $this->plugin_slug . '</code>',
                                         trim( $this->has_trademarked_slug(), '-' ),
                                         '<code>Plugin Name:</code>',
@@ -236 +236 @@
 
                                 return new \WP_Error( 'already_exists_in_the_wild', $error . ' ' . sprintf(
                                         /* translators: 1: plugin slug, 2: 'Plugin Name:' */
-                                        __( 'There is already a plugin with the name %1$s known to exist, though it is not hosted on WordPress.org. This means the permalink %2$s is already in use, and has a significant user base. Were we to accept it as-is, our system would overwrite those other installs and potentially damage any existing users. This is especially true since WordPress 5.5 and up will automatically update plugins and themes. You must rename your plugin by changing the %3$s line in your main plugin file and in your readme. Once you have done so, you may upload it again. If you feel this is an incorrect assessment of the situation, please email <a href="mailto:%4$s">%4$s</a> and explain why so that we may help you.', 'wporg-plugins' ),
+                                        __( 'There is already a plugin with the name %1$s known to exist, though it is not hosted on WordPress.org. This means the permalink %2$s is already in use on active sites, and has a significant user base. Were we to accept it as-is, our system would overwrite those other installs and potentially damage any existing users. This is especially true since WordPress 5.5 and up will automatically update plugins and themes. You must rename your plugin by changing the %3$s line in your main plugin file and in your readme. Once you have done so, you may upload it again. If you feel this is an incorrect assessment of the situation, please email <a href="mailto:%4$s">%4$s</a> and explain why so that we may help you.', 'wporg-plugins' ),
                                         '<code>' . $this->plugin['Name'] . '</code>',
                                         '<code>' . $this->plugin_slug . '</code>',
                                         '<code>Plugin Name:</code>',
@@ -407 +407 @@
                         'upload',
                         'wp-admin',
                         // Reserved names.
+                        'meta',
                         'jquery',
                         'wordpress',
                         // common submissions by people trying to upload locally.
@@ -482 +483 @@
                         'jetpack-',
                         'macintosh-',
                         'mailchimp-',
+                        'meta-',
+                        'metaverse',
                         'microsoft-',
                         'ninja-forms-',
                         'oculus',
@@ -529 +532 @@
                 $trademark_exceptions = array(
                         'yoast.com'             => array( 'yoast' ),
                         'automattic.com'        => array( 'akismet', 'akismet-', 'jetpack', 'jetpack-', 'wordpress', 'wp-', 'woo', 'woo-', 'woocommerce', 'woocommerce-' ),
-                        'facebook.com'          => array( 'facebook', 'instagram', 'oculus', 'whatsapp' ),
+                        'facebook.com'          => array( 'facebook', 'instagram', 'meta-', 'metaverse', 'oculus', 'whatsapp' ),
                         'support.microsoft.com' => array( 'bing-', 'microsoft-' ),
                         'trustpilot.com'        => array( 'trustpilot' ),
                         'microsoft.com'         => array( 'bing-', 'microsoft-' ),