Making WordPress.org

Ticket #4718: 4718.diff

File 4718.diff, 4.9 KB (added by Ipstenu, 5 years ago)
  • trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

     
    119119
    120120                        return new \WP_Error( 'trademarked_name', $error . ' ' . sprintf(
    121121                                /* translators: 1: plugin slug, 2: trademarked term, 3: 'Plugin Name:', 4: plugin email address */
    122                                 __( 'Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used. Per the demands of trademark owners and in order to protect developers, we are disallowing the use of certain terms in ways that are infringing or misleading. Please change the %3$s line in your main plugin file and readme so that you may upload your plugin for review. If you feel this is in error, please email us at %4$s and explain why.', 'wporg-plugins' ),
     122                                __( 'Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used. Per the demands of trademark owners and in order to protect developers, we disallow the use of certain terms in ways that are infringing or misleading. In many cases, renaming your plugin to end with "for-%2$s" instead will resolve this issue. To do this, please change the %3$s line in your main plugin file and readme and upload the plugin again. If you feel this is in error, please email us at %4$s and explain why.', 'wporg-plugins' ),
    123123                                '<code>' . $this->plugin_slug . '</code>',
    124124                                $this->has_trademarked_slug(),
    125125                                '<code>Plugin Name:</code>',
     
    147147
    148148                        return new \WP_Error( 'already_submitted', $error . ' ' . sprintf(
    149149                                /* translators: 1: plugin slug, 2: Documentation URL, 3: plugins@wordpress.org */
    150                                 __( '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 <a href="%2$s">SVN</a>. If you need assistance, email <a href="mailto:%3$s">%3$s</a> and let us know. Make sure to include any error messages in your email.', 'wporg-plugins' ),
     150                                __( 'You have already submitted a plugin named %1$s. There is no need to resubmit existing plugins, even for new versions. Instead, please update your plugin within the directory via <a href="%2$s">SVN</a>. If you need assistance, email <a href="mailto:%3$s">%3$s</a> and let us know.', 'wporg-plugins' ),
    151151                                '<code>' . $this->plugin_slug . '</code>',
    152152                                __( 'https://developer.wordpress.org/plugins/wordpress-org/how-to-use-subversion/', 'wporg-plugins' ),
    153153                                'plugins@wordpress.org'
     
    209209                }
    210210
    211211                $readme = $this->find_readme_file();
     212                // Check for a valid readme
    212213                if ( empty( $readme ) ) {
    213214                        $error = __( 'Error: The plugin has no readme.', 'wporg-plugins' );
    214215
     
    305306
    306307                $message = sprintf(
    307308                        /* translators: 1: plugin name, 2: plugin slug, 3: plugins@wordpress.org */
    308                         __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. Your plugin has been given the initial 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 immediately, as it cannot be changed once your plugin is approved.' ),
     309                        __( 'Thank you for uploading %1$s to the WordPress Plugin Directory. Your plugin has been given the initial 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 immediately and tell us exactly what the correct slug should be. Remember, a plugin slug cannot be changed once your plugin is approved.' ),
    309310                        esc_html( $this->plugin['Name'] ),
    310311                        '<code>' . $this->plugin_slug . '</code>'
    311312                ) . '</p><p>';
     
    378379                        'elementor-',
    379380                        'facebook',
    380381                        'feedburner',
     382                        'github-',
    381383                        'google-',
    382384                        'gravity-forms-',
    383385                        'gutenberg',
     
    498500
    499501Your plugin has been given the initial slug of %2$s based on your display name of %1$s. This is subject to change based on the results of your review.
    500502
    501 If you need to change the plugin slug, please reply to this email immediately and let us know, otherwise we will be unable to do so later.
     503If you need to change the plugin slug, please reply to this email immediately and let us know what the correct slug should be. We will be unable to change your plugin slug once your review is completed.
    502504
    503505If there are any other problems with your 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.
    504506
     
    509511
    510512Also, make sure to follow our official blog: https://make.wordpress.org/plugins/
    511513
     514Note: Reviews are currently in English only. We apologize for the inconvenience.
     515
    512516--
    513517The WordPress Plugin Directory Team
    514518https://make.wordpress.org/plugins', 'wporg-plugins'