Changeset 50234

Timestamp:

02/07/2021 12:42:06 PM (6 years ago)

Author:

SergeyBiryukov

Message:

I18N: Use the actual placeholder instead of a number in translator comments if the corresponding string does not use numbered placeholders.

Adjust some newly introduced strings to remove unnecessary numbered placeholders for consistency.

Follow-up to [42827].

See #51800.

Location:

trunk/src

Files:

• wp-admin/erase-personal-data.php (modified) (1 diff)
• wp-admin/export-personal-data.php (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-content/themes/twentynineteen/template-parts/content/content-none.php (modified) (1 diff)
• wp-content/themes/twentytwentyone/template-parts/content/content-none.php (modified) (1 diff)
• wp-content/themes/twentytwentyone/template-parts/post/author-bio.php (modified) (1 diff)
• wp-includes/class-wp-block-pattern-categories-registry.php (modified) (1 diff)
• wp-includes/class-wp-block-patterns-registry.php (modified) (1 diff)
• wp-includes/rest-api.php (modified) (4 diffs)

trunk/src/wp-admin/erase-personal-data.php

@@ -42 +42 @@
 
 $privacy_policy_guide = '<p>' . sprintf(
-        /* translators: 1: URL to Privacy Policy Guide screen. */
-        __( 'If you are not sure, check the plugin documentation or contact the plugin author to see if the plugin collects data and if it supports the Data Eraser tool. This information may be available in the <a href="%1$s">Privacy Policy Guide</a>.' ),
+        /* translators: %s: URL to Privacy Policy Guide screen. */
+        __( 'If you are not sure, check the plugin documentation or contact the plugin author to see if the plugin collects data and if it supports the Data Eraser tool. This information may be available in the <a href="%s">Privacy Policy Guide</a>.' ),
         admin_url( 'options-privacy.php?tab=policyguide' )
 ) . '</p>';

trunk/src/wp-admin/export-personal-data.php

@@ -42 +42 @@
 
 $privacy_policy_guide = '<p>' . sprintf(
-        /* translators: 1: URL to Privacy Policy Guide screen. */
-        __( 'If you are not sure, check the plugin documentation or contact the plugin author to see if the plugin collects data and if it supports the Data Exporter tool. This information may be available in the <a href="%1$s">Privacy Policy Guide</a>.' ),
+        /* translators: %s: URL to Privacy Policy Guide screen. */
+        __( 'If you are not sure, check the plugin documentation or contact the plugin author to see if the plugin collects data and if it supports the Data Exporter tool. This information may be available in the <a href="%s">Privacy Policy Guide</a>.' ),
         admin_url( 'options-privacy.php?tab=policyguide' )
 ) . '</p>';

trunk/src/wp-admin/includes/ajax-actions.php

@@ -5430 +5430 @@
         if ( true === $results ) {
                 wp_send_json_success(
-                        /* translators: 1: User's display name. */
+                        /* translators: %s: User's display name. */
                         sprintf( __( 'A password reset link was emailed to %s.' ), $user->display_name )
                 );

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

@@ -1404 +1404 @@
                                 <?php
                                 printf(
-                                        /* translators: 1: Localized meetup organization documentation URL. */
-                                        __( 'Want more events? <a href="%1$s">Help organize the next one</a>!' ),
+                                        /* translators: %s: Localized meetup organization documentation URL. */
+                                        __( 'Want more events? <a href="%s">Help organize the next one</a>!' ),
                                         __( 'https://make.wordpress.org/community/organize-event-landing-page/' )
                                 );

trunk/src/wp-admin/user-edit.php

@@ -624 +624 @@
                         <p class="description">
                                 <?php
-                                /* translators: 1: User's display name. */
+                                /* translators: %s: User's display name. */
                                 printf( __( 'Send %s a link to reset their password. This will not change their password, nor will it force a change.' ), esc_html( $profileuser->display_name ) );
                                 ?>

trunk/src/wp-content/themes/twentynineteen/template-parts/content/content-none.php

@@ -23 +23 @@
                         printf(
                                 '<p>' . wp_kses(
-                                        /* translators: 1: Link to WP admin new post page. */
-                                        __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'twentynineteen' ),
+                                        /* translators: %s: Link to WP admin new post page. */
+                                        __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentynineteen' ),
                                         array(
                                                 'a' => array(

trunk/src/wp-content/themes/twentytwentyone/template-parts/content/content-none.php

@@ -40 +40 @@
                         printf(
                                 '<p>' . wp_kses(
-                                        /* translators: 1: Link to WP admin new post page. */
-                                        __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'twentytwentyone' ),
+                                        /* translators: %s: Link to WP admin new post page. */
+                                        __( 'Ready to publish your first post? <a href="%s">Get started here</a>.', 'twentytwentyone' ),
                                         array(
                                                 'a' => array(

trunk/src/wp-content/themes/twentytwentyone/template-parts/post/author-bio.php

@@ -13 +13 @@
                 <?php echo get_avatar( get_the_author_meta( 'ID' ), '85' ); ?>
                 <div class="author-bio-content">
-                        <h2 class="author-title"><?php printf( /* translators: 1: Author name. */ esc_html__( 'By %s', 'twentytwentyone' ), get_the_author() ); ?></h2>
+                        <h2 class="author-title">
+                        <?php
+                        printf(
+                                /* translators: %s: Author name. */
+                                esc_html__( 'By %s', 'twentytwentyone' ),
+                                get_the_author()
+                        );
+                        ?>
+                        </h2>
                         <p class="author-description"> <?php the_author_meta( 'description' ); ?></p><!-- .author-description -->
                         <?php
                         printf(
-                                /* translators: 1: Link to authors posts. 2: Author name. */
-                                '<a class="author-link" href="%1$s" rel="author">' . esc_html__( 'View all of %2$s\'s posts.', 'twentytwentyone' ) . '</a>',
+                                '<a class="author-link" href="%1$s" rel="author">%2$s</a>',
                                 esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-                                get_the_author()
+                                sprintf(
+                                        /* translators: %s: Author name. */
+                                        esc_html__( 'View all of %s\'s posts.', 'twentytwentyone' ),
+                                        get_the_author()
+                                )
                         );
                         ?>

trunk/src/wp-includes/class-wp-block-pattern-categories-registry.php

@@ -61 +61 @@
         public function unregister( $category_name ) {
                 if ( ! $this->is_registered( $category_name ) ) {
-                        /* translators: 1: Block pattern name. */
-                        $message = sprintf( __( 'Block pattern category "%1$s" not found.' ), $category_name );
+                        /* translators: %s: Block pattern name. */
+                        $message = sprintf( __( 'Block pattern category "%s" not found.' ), $category_name );
                         _doing_it_wrong( __METHOD__, $message, '5.5.0' );
                         return false;

trunk/src/wp-includes/class-wp-block-patterns-registry.php

@@ -74 +74 @@
         public function unregister( $pattern_name ) {
                 if ( ! $this->is_registered( $pattern_name ) ) {
-                        /* translators: 1: Pattern name. */
-                        $message = sprintf( __( 'Pattern "%1$s" not found.' ), $pattern_name );
+                        /* translators: %s: Pattern name. */
+                        $message = sprintf( __( 'Pattern "%s" not found.' ), $pattern_name );
                         _doing_it_wrong( __METHOD__, $message, '5.5.0' );
                         return false;

trunk/src/wp-includes/rest-api.php

@@ -1786 +1786 @@
         }
 
-        /* translators: 1: Parameter. */
-        return new WP_Error( 'rest_no_matching_schema', sprintf( __( '%1$s does not match any of the expected formats.' ), $param ) );
+        /* translators: %s: Parameter. */
+        return new WP_Error( 'rest_no_matching_schema', sprintf( __( '%s does not match any of the expected formats.' ), $param ) );
 }
 
@@ -1890 +1890 @@
                 return new WP_Error(
                         'rest_one_of_multiple_matches',
-                        /* translators: 1: Parameter. */
-                        sprintf( __( '%1$s matches more than one of the expected formats.' ), $param ),
+                        /* translators: %s: Parameter. */
+                        sprintf( __( '%s matches more than one of the expected formats.' ), $param ),
                         array( 'positions' => $schema_positions )
                 );
@@ -2381 +2381 @@
 
         if ( ! empty( $args['uniqueItems'] ) && ! rest_validate_array_contains_unique_items( $value ) ) {
-                /* translators: 1: Parameter. */
-                return new WP_Error( 'rest_duplicate_items', sprintf( __( '%1$s has duplicate items.' ), $param ) );
+                /* translators: %s: Parameter. */
+                return new WP_Error( 'rest_duplicate_items', sprintf( __( '%s has duplicate items.' ), $param ) );
         }
 
@@ -2683 +2683 @@
 
                 if ( ! empty( $args['uniqueItems'] ) && ! rest_validate_array_contains_unique_items( $value ) ) {
-                        /* translators: 1: Parameter. */
-                        return new WP_Error( 'rest_duplicate_items', sprintf( __( '%1$s has duplicate items.' ), $param ) );
+                        /* translators: %s: Parameter. */
+                        return new WP_Error( 'rest_duplicate_items', sprintf( __( '%s has duplicate items.' ), $param ) );
                 }