Changeset 13462 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php

Timestamp:

04/05/2024 04:55:33 AM (15 months ago)

Author:

dd32

Message:

Plugin Directory: Expand the trademark checks to match multiple trademarks in the field checked.

Simplifies the error message and centralises the 3 uses of it.

See #5868.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php

@@ -396 +396 @@
 
             case 'trademarked_name':
-                $trademark = $data['trademark'];
-                $context   = $data['context'];
-
-                if ( str_ends_with( $trademark, '-' ) ) {
-                    // Trademarks ending in "-" indicate slug cannot BEGIN with that term.
-                    return sprintf(
-                        /* translators: 1: plugin name/slug, 2: trademarked term, 3: plugin email address */
-                        __( 'The plugin name includes a restricted term. Your chosen plugin name - %1$s - contains the restricted term "%2$s" and cannot be used to begin your slug, permalink, display name, or plugin name. We disallow the use of certain terms in ways that are abused, or potentially infringe on and/or are misleading with regards to trademarks. If you feel this is in error, such as you legally own the trademark for the term, please email us at %4$s and explain your situation.', 'wporg-plugins' ),
-                        '<code>' . esc_html( $context ) . '</code>',
-                        '<code>' . esc_html( trim( $trademark, '-' ) ) . '</code>',
-                        '<code>plugins@wordpress.org</code>'
+            case 'trademarked_slug':
+            case 'trademarked':
+                $trademarks = (array) $data['trademark'];
+                $context    = $data['context'];
+                $messages   = [];
+    
+                $cannot_start_with = array_filter( $trademarks, function( $slug ) {
+                    return str_ends_with( $slug, '-' );
+                } );
+                $cannot_contain    = array_diff( $trademarks, $cannot_start_with );
+
+                if ( $cannot_start_with ) {
+                    $messages[] = sprintf(
+                        /* translators: 1: plugin slug, 2: trademarked term, 3: 'Plugin Name:', 4: plugin email address */
+                        _n(
+                            'Your chosen plugin name - %1$s - contains the restricted term "%2$s" which cannot be used to begin your permalink or display name. We disallow the use of certain terms in ways that are abused, or potentially infringe on and/or are misleading with regards to trademarks.',
+                            'Your chosen plugin name - %1$s - contains the restricted terms "%2$s" which cannot be used to begin your permalink or display name. We disallow the use of certain terms in ways that are abused, or potentially infringe on and/or are misleading with regards to trademarks.',
+                            count( $cannot_start_with ),
+                            'wporg-plugins'
+                        ),
+                        '<code>' . $context . '</code>',
+                        '<code>' . implode( '</code>", "<code>', $cannot_start_with ) . '</code>'
                     );
-                } else {
-                    // Trademarks that do NOT end in "-" indicate slug cannot contain term at all.
-                    return sprintf(
-                        /* translators: 1: plugin name/slug, 2: trademarked term, 3: plugin email address */
-                        __( 'The plugin name includes a restricted term. 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. If you feel this is in error, such as you legally own the trademark for a term, please email us at %3$s and explain your situation.', 'wporg-plugins' ),
-                        '<code>' . esc_html( $context ) . '</code>',
-                        '<code>' . esc_html( trim( $trademark, '-' ) ) . '</code>',
-                        '<code>plugins@wordpress.org</code>'
+                }
+                if ( $cannot_contain ) {
+                    $messages[] = sprintf(
+                        /* translators: 1: plugin slug, 2: trademarked term, 3: 'Plugin Name:', 4: plugin email address */
+                        _n(
+                            'Your chosen plugin name - %1$s - contains the restricted term "%2$s", which cannot be used at all in your plugin permalink nor the display name.',
+                            'Your chosen plugin name - %1$s - contains the restricted terms "%2$s", which cannot be used at all in your plugin permalink nor the display name.',
+                            count( $cannot_contain ),
+                            'wporg-plugins'
+                        ),
+                        '<code>' . $context . '</code>',
+                        '<code>' . implode( '</code>", "<code>', $cannot_contain ) . '</code>'
                     );
                 }
+
+                return implode( '<br>', $messages );
 
             /* The are not generated by the Readme Parser, but rather the import parser. */