Changeset 44562

Timestamp:

01/11/2019 06:03:46 AM (6 years ago)

Author:

pento

Message:

Coding Standards: Fix the minor WordPress.WP.I18n violations.

WordPress.WP.I18n.MissingTranslatorsComment is in progress in #44360.

See #45934.

Location:

trunk

Files:

• phpcs.xml.dist (modified) (1 diff)
• src/wp-admin/credits.php (modified) (2 diffs)
• src/wp-admin/includes/import.php (modified) (1 diff)
• src/wp-admin/includes/plugin.php (modified) (1 diff)
• src/wp-content/themes/twentyeleven/comments.php (modified) (1 diff)
• src/wp-content/themes/twentyten/comments.php (modified) (1 diff)
• src/wp-content/themes/twentythirteen/comments.php (modified) (1 diff)
• src/wp-content/themes/twentytwelve/comments.php (modified) (1 diff)
• src/wp-includes/category-template.php (modified) (2 diffs)
• src/wp-includes/class-wp-theme.php (modified) (2 diffs)
• src/wp-includes/functions.php (modified) (2 diffs)
• src/wp-includes/post.php (modified) (1 diff)

trunk/phpcs.xml.dist

@@ -91 +91 @@
     <rule ref="WordPress.WP.I18n">
         <exclude-pattern>/src/wp-includes/l10n\.php</exclude-pattern>
+        <exclude-pattern>/tests/phpunit/tests/l10n\.php</exclude-pattern>
+        <exclude-pattern>/tests/phpunit/tests/l10n/loadTextdomainJustInTime\.php</exclude-pattern>
     </rule>
 

trunk/src/wp-admin/credits.php

@@ -66 +66 @@
             $title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
         } elseif ( isset( $group_data['placeholders'] ) ) {
+            // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
             $title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
         } else {
+            // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
             $title = translate( $group_data['name'] );
         }
@@ -101 +103 @@
                 echo esc_html( $person_data[0] ) . "</a>\n\t";
                 if ( ! $compact ) {
+                    // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
                     echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
                 }

trunk/src/wp-admin/includes/import.php

@@ -168 +168 @@
 
         foreach ( $popular_importers['importers'] as &$importer ) {
+            // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
             $importer['description'] = translate( $importer['description'] );
             if ( $importer['name'] != 'WordPress' ) {
+                // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
                 $importer['name'] = translate( $importer['name'] );
             }

trunk/src/wp-admin/includes/plugin.php

@@ -138 +138 @@
         if ( $textdomain ) {
             foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field ) {
+                // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText,WordPress.WP.I18n.NonSingularStringLiteralDomain
                 $plugin_data[ $field ] = translate( $plugin_data[ $field ], $textdomain );
             }

trunk/src/wp-content/themes/twentyeleven/comments.php

@@ -32 +32 @@
         <h2 id="comments-title">
             <?php
+            if ( 1 === get_comments_number() ) {
                 printf(
-                    _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentyeleven' ),
+                    /* translators: %s: The post title. */
+                    __( 'One thought on &ldquo;%1$s&rdquo;', 'twentyeleven' ),
+                    '<span>' . get_the_title() . '</span>'
+                );
+            } else {
+                printf(
+                    /* translators: %1$s: The number of comments. %2$s: The post title. */
+                    _n( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentyeleven' ),
                     number_format_i18n( get_comments_number() ),
                     '<span>' . get_the_title() . '</span>'
                 );
+            }
             ?>
         </h2>

trunk/src/wp-content/themes/twentyten/comments.php

@@ -35 +35 @@
             <h3 id="comments-title">
             <?php
-            printf(
-                _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
-                number_format_i18n( get_comments_number() ),
-                '<em>' . get_the_title() . '</em>'
-            );
+            if ( 1 === get_comments_number() ) {
+                printf(
+                    /* translators: %s: The post title. */
+                    __( 'One Response to %s', 'twentyten' ),
+                    '<em>' . get_the_title() . '</em>'
+                );
+            } else {
+                /* translators: %1$s: The number of comments. %2$s: The post title. */
+                printf(
+                    _n( '%1$s Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
+                    number_format_i18n( get_comments_number() ),
+                    '<em>' . get_the_title() . '</em>'
+                );
+            }
             ?>
             </h3>

trunk/src/wp-content/themes/twentythirteen/comments.php

@@ -24 +24 @@
         <h2 class="comments-title">
             <?php
+            if ( 1 === get_comments_number() ) {
                 printf(
-                    _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'twentythirteen' ),
+                    /* translators: %s: The post title. */
+                    _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentythirteen' ),
+                    '<span>' . get_the_title() . '</span>'
+                );
+            } else {
+                printf(
+                    /* translators: %1$s: The number of comments. %2$s: The post title. */
+                    _nx( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'twentythirteen' ),
                     number_format_i18n( get_comments_number() ),
                     '<span>' . get_the_title() . '</span>'
                 );
+            }
             ?>
         </h2>

trunk/src/wp-content/themes/twentytwelve/comments.php

@@ -30 +30 @@
         <h2 class="comments-title">
             <?php
+            if ( 1 === get_comments_number() ) {
                 printf(
-                    _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
+                    /* translators: %s: The post title. */
+                    __( 'One thought on &ldquo;%s&rdquo;', 'twentytwelve' ),
+                    '<span>' . get_the_title() . '</span>'
+                );
+            } else {
+                printf(
+                    /* translators: %1$s: The number of comments. %2$s: The post title. */
+                    _n( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentytwelve' ),
                     number_format_i18n( get_comments_number() ),
                     '<span>' . get_the_title() . '</span>'
                 );
+            }
             ?>
         </h2>

trunk/src/wp-includes/category-template.php

@@ -837 +837 @@
         // Look for the alternative callback style. Ignore the previous default.
         if ( $args['topic_count_text_callback'] === 'default_topic_count_text' ) {
+            // wpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralSingle,WordPress.WP.I18n.NonSingularStringLiteralPlural
             $translate_nooped_plural = _n_noop( '%s item', '%s items' );
         } else {
@@ -843 +844 @@
     } elseif ( isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
         // If no callback exists, look for the old-style single_text and multiple_text arguments.
+        // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralSingle,WordPress.WP.I18n.NonSingularStringLiteralPlural
         $translate_nooped_plural = _n_noop( $args['single_text'], $args['multiple_text'] );
     } else {

trunk/src/wp-includes/class-wp-theme.php

@@ -875 +875 @@
                     return $this->name_translated;
                 }
+                // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText,WordPress.WP.I18n.NonSingularStringLiteralDomain
                 $this->name_translated = translate( $value, $this->get( 'TextDomain' ) );
                 return $this->name_translated;
@@ -926 +927 @@
 
             default:
+                // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText,WordPress.WP.I18n.NonSingularStringLiteralDomain
                 $value = translate( $value, $this->get( 'TextDomain' ) );
         }

trunk/src/wp-includes/functions.php

@@ -5074 +5074 @@
         $exists[5] = ( $exists[2] && $exists[3] );
 
+        // phpcs:disable WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
         $zonen[] = array(
             'continent'   => ( $exists[0] ? $zone[0] : '' ),
@@ -5082 +5083 @@
             't_subcity'   => ( $exists[5] ? translate( str_replace( '_', ' ', $zone[2] ), 'continents-cities' ) : '' ),
         );
+        // phpcs:enable
     }
     usort( $zonen, '_wp_timezone_choice_usort_callback' );

trunk/src/wp-includes/post.php

@@ -1038 +1038 @@
 
     if ( false === $args->label_count ) {
+        // phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralSingle,WordPress.WP.I18n.NonSingularStringLiteralPlural
         $args->label_count = _n_noop( $args->label, $args->label );
     }