Changeset 5001

Timestamp:

02/24/2017 06:30:31 PM (8 years ago)

Author:

coffee2code

Message:

Plugin Directory: i18n cleanup.

Props SergeyBiryukov.
Fixes #2534.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• admin/class-customizations.php (modified) (3 diffs)
• admin/list-table/class-plugin-posts.php (modified) (3 diffs)
• admin/metabox/class-author-card.php (modified) (1 diff)
• class-template.php (modified) (1 diff)
• widgets/class-meta.php (modified) (1 diff)
• widgets/class-ratings.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-customizations.php

@@ -81 +81 @@
 
         if ( $num_posts && $num_posts->publish ) {
-            $text             = sprintf( _n( '%s Plugin', '%s Plugins', $num_posts->publish ), number_format_i18n( $num_posts->publish ) );
+            $text             = sprintf( _n( '%s Plugin', '%s Plugins', $num_posts->publish, 'wporg-plugins' ), number_format_i18n( $num_posts->publish ) );
             $post_type_object = get_post_type_object( $post_type );
 
@@ -198 +198 @@
                 'setting' => 'wporg-plugins',
                 'code'    => 'plugins-bulk-rejected',
-                'message' => sprintf( _n( '1 plugin rejected.', '%d plugins rejected.', $rejected, 'wporg-plugins' ), $rejected ),
+                'message' => sprintf( _n( '%d plugin rejected.', '%d plugins rejected.', $rejected, 'wporg-plugins' ), $rejected ),
                 'type'    => 'updated',
             ) ) );
@@ -528 +528 @@
             'in_moderation'        => $counts->moderated,
             'i18n_comments_text'   => sprintf(
-                _n( '%s Comment', '%s Comments', $counts->approved ),
+                _n( '%s Comment', '%s Comments', $counts->approved, 'wporg-plugins' ),
                 number_format_i18n( $counts->approved )
             ),
             'i18n_moderation_text' => sprintf(
-                _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
+                _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments', 'wporg-plugins' ),
                 number_format_i18n( $counts->moderated )
             )

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php

@@ -362 +362 @@
                     $user_post_count,
                     'posts',
-                    'wporg-posts'
+                    'wporg-plugins'
                 ),
                 number_format_i18n( $user_post_count )
@@ -388 +388 @@
                 $total_posts,
                 'posts',
-                'wporg-posts'
+                'wporg-plugins'
             ),
             number_format_i18n( $total_posts )
@@ -442 +442 @@
                     $this->sticky_posts_count,
                     'posts',
-                    'wporg-posts'
+                    'wporg-plugins'
                 ),
                 number_format_i18n( $this->sticky_posts_count )

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php

@@ -97 +97 @@
                 echo 'Not a developer on any plugin.';
             } else {
-                echo '<strong>' . sprintf( _n( '1 plugin:', '%d plugins:', count( $all_plugins ) ), count( $all_plugins ) ) . '</strong>';
+                echo '<strong>' . sprintf( _n( '%d plugin:', '%d plugins:', count( $all_plugins ), 'wporg-plugins' ), count( $all_plugins ) ) . '</strong>';
 
                 echo '<ul>';

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

@@ -25 +25 @@
             $text = __( 'Less than 10', 'wporg-plugins' );
         } elseif ( $count >= 1000000 ) {
+            $million_count = intdiv( $count, 1000000 );
             /* translators: %d: The integer number of million active installs */
-            $text = sprintf( __( '%d+ million', 'wporg-plugins' ), intdiv( $count, 1000000 ) );
+            $text = sprintf( _n( '%d+ million', '%d+ million', $million_count, 'wporg-plugins' ), $million_count );
         } else {
             $text = number_format_i18n( $count ) . '+';

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-meta.php

@@ -60 +60 @@
             <?php } ?>
             <?php if ( $tags = get_the_term_list( $post->ID, 'plugin_tags', '<div class="tags">', '', '</div>' ) ) : ?>
-                <li><?php printf( _n( 'Tag: %s', 'Tags: %s', count( get_the_terms( $post, 'plugin_tags' ) ), 'wporg-plugins' ), $tags ); ?></li>
+                <li><?php
+                    $terms = get_the_terms( $post, 'plugin_tags' );
+                    if ( 1 == count( $terms ) ) {
+                        printf( __( 'Tag: %s', 'wporg-plugins' ), $tags );
+                    } else {
+                        printf( __( 'Tags: %s', 'wporg-plugins' ), $tags );
+                    }
+                ?></li>
             <?php endif; ?>
         </ul>

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-ratings.php

@@ -53 +53 @@
                     <li class="counter-container">
                         <a href="<?php echo esc_url( 'https://wordpress.org/support/plugin/' . $post->post_name . '/reviews/?filter=' . $stars ); ?>">
-                            <span class="counter-label"><?php printf( _n( '%d star', '%d stars', $stars, 'wporg-plugin' ), $stars ); ?></span>
+                            <span class="counter-label"><?php printf( _n( '%d star', '%d stars', $stars, 'wporg-plugins' ), $stars ); ?></span>
                     <span class="counter-back">
                         <span class="counter-bar" style="width: <?php echo $rating_bar_width; ?>%;"></span>