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

Timestamp:

05/10/2021 06:01:46 PM (4 years ago)

Author:

Ipstenu

Message:

Handling More Trademark Dramas

Clarifying the language that 'working around' the trademark catcher (i.e. using 'Wordpess' instead of 'WordPress' or 'Wh4tsApp' instead of 'WhatsApp') is not okay, AND that unless you're the trademark OWNER, it's probably not an error.

Adding in more trademarks per owner requests.

Adding in commonly used 'workarounds' because people are weird.

Fixes #5729

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

@@ -122 +122 @@
                 $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. If you feel this is in error, 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. 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(), '-' ),
@@ -132 +132 @@
                 $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. Per the demands of trademark owners we disallow the use of certain terms in ways that are infringing 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, 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(), '-' ),
@@ -414 +414 @@
             'site-kit-by-google',
             'yoast-seo',
+            'woo',
             'wp-media-folder',
             'wp-file-download',
@@ -434 +435 @@
             'adwords-',
             'akismet-',
+            'all-in-one-wp-migration',
             'amazon-',
             'android-',
             'apple-',
+            'applenews-',
             'aws-',
             'bbpress-',
@@ -443 +446 @@
             'buddypress-',
             'contact-form-7-',
+            'cpanel-',
+            'disqus-',
             'divi-',
+            'dropbox-',
             'easy-digital-downloads-',
             'elementor-',
             'envato-',
+            'fbook',
             'facebook',
             'fb-',
+            'fb-messenger',
+            'fedex-',
             'feedburner',
+            'ganalytics-',
             'gberg',
             'github-',
             'givewp-',
             'google-',
+            'googlebot-',
             'googles-',
+            'gravity-form-',
             'gravity-forms-',
             'gutenberg',
@@ -460 +472 @@
             'hubspot-',
             'ig-',
+            'insta-',
             'instagram',
+            'internet-explorer-',
             'jetpack-',
             'macintosh-',
+            'mailchimp-',
             'microsoft-',
             'ninja-forms-',
             'oculus',
+            'onlyfans-',
+            'only-fans-',
+            'paddle-',
             'paypal-',
             'pinterest-',
             'stripe-',
+            'tiktok-',
+            'trustpilot',
             'twitter-',
             'tweet',
+            'ups-',
+            'usps-',
+            'vvhatsapp',
+            'vvcommerce',
+            'vva-',
+            'vvoo',
             'wa-',
+            'wh4tsapps',
             'whatsapp',
             'whats-app',
@@ -477 +504 @@
             'windows-',
             'wocommerce',
+            'woocom-',
             'woocommerce',  // technically ending with '-for-woocommerce' is allowed.
+            'woocomerce',
             'woo-commerce',
             'woo-',
             'wo-',
             'wordpress',
+            'wordpess',
             'wpress',
             'wp-',
@@ -496 +526 @@
             'facebook.com'          => array( 'facebook', 'instagram', 'oculus', 'whatsapp' ),
             'support.microsoft.com' => array( 'bing-', 'microsoft-' ),
+            'trustpilot.com'        => array( 'trustpilot' ),
             'microsoft.com'         => array( 'bing-', 'microsoft-' ),
         );