WordPress.org

Making WordPress.org

Changeset 9805


Ignore:
Timestamp:
05/01/2020 06:14:39 AM (21 months ago)
Author:
dd32
Message:

Plugin Directory: Add a few more slugs to the Trademark list, and soften language around some automated rejection reasons.

Props Ipstenu.
See #5178.

File:
1 edited

Legend:

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

    r9670 r9805  
    122122                $message = sprintf(
    123123                    /* translators: 1: plugin slug, 2: trademarked term, 3: 'Plugin Name:', 4: plugin email address */
    124                     __( 'Your chosen plugin name - %1$s - contains the prohibited term "%2$s" and cannot be used. Per the demands of trademark owners we have been required to prevent the use of the term at all. 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' ),
     124                    __( 'Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used at all in your plugin permalink. 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' ),
    125125                    '<code>' . $this->plugin_slug . '</code>',
    126126                    trim( $this->has_trademarked_slug(), '-' ),
     
    209209            return new \WP_Error( 'invalid_version', $error . ' ' . sprintf(
    210210                /* translators: %s: 'Version:' */
    211                 __( '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' ),
     211                __( 'Version strings may 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' ),
    212212                '<code>Version:</code>'
    213213            ) );
     
    233233                return new \WP_Error( 'already_exists_in_the_wild', $error . ' ' . sprintf(
    234234                    /* translators: 1: plugin slug, 2: 'Plugin Name:' */
    235                     __( 'There is already a plugin with the name %1$s known to WordPress.org. You must rename your plugin by changing the %2$s line in your main plugin file and in your readme. Once you have done so, you may upload it again.', 'wporg-plugins' ),
     235                    __( 'There is already a plugin with the name %1$s known to exist. This generally means the permalink %2$s is already in use outside of WordPress.org and has a significant user base. 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 incorrect, email <a href="mailto:%4$s">%4$s</a> and explain why so that we may help you.', 'wporg-plugins' ),
    236236                    '<code>' . $this->plugin['Name'] . '</code>',
    237                     '<code>Plugin Name:</code>'
     237                    '<code>' . $this->plugin_slug . '</code>',
     238                    '<code>Plugin Name:</code>',
     239                    'plugins@wordpress.org'
    238240                ) );
    239241            }
     
    432434            'envato-',
    433435            'facebook',
     436            'fb-',
    434437            'feedburner',
    435438            'github-',
     
    437440            'gravity-forms-',
    438441            'gutenberg',
     442            'ig-',
    439443            'instagram',
     444            'jetpack-',
    440445            'macintosh-',
    441446            'microsoft-',
     
    446451            'twitter-',
    447452            'tweet',
     453            'wa-',
    448454            'whatsapp',
    449455            'whats-app',
    450             'woocommerce-',
     456            'woocommerce',
    451457            'woo-',
    452458            'wordpress',
Note: See TracChangeset for help on using the changeset viewer.