Changeset 6649

Timestamp:

08/11/2017 07:01:51 PM (9 years ago)

Author:

SergeyBiryukov

Message:

i18n: Simplify [6645] with translate_nooped_plural().

See #3139.

File:

• trunk/src/includes/common/formatting.php (modified) (3 diffs)

trunk/src/includes/common/formatting.php

@@ -630 +630 @@
                 // array of time period chunks
                 $chunks = array(
-                        array( YEAR_IN_SECONDS,   '%s year',   '%s years',   _n_noop( '%s year',   '%s years',   'bbpress' ) ),
-                        array( MONTH_IN_SECONDS,  '%s month',  '%s months',  _n_noop( '%s month',  '%s months',  'bbpress' ) ),
-                        array( WEEK_IN_SECONDS,   '%s week',   '%s weeks',   _n_noop( '%s week',   '%s weeks',   'bbpress' ) ),
-                        array( DAY_IN_SECONDS,    '%s day',    '%s days',    _n_noop( '%s day',    '%s days',    'bbpress' ) ),
-                        array( HOUR_IN_SECONDS,   '%s hour',   '%s hours',   _n_noop( '%s hour',   '%s hours',   'bbpress' ) ),
-                        array( MINUTE_IN_SECONDS, '%s minute', '%s minutes', _n_noop( '%s minute', '%s minutes', 'bbpress' ) ),
-                        array( 1,                 '%s second', '%s seconds', _n_noop( '%s second', '%s seconds', 'bbpress' ) ),
+                        array( YEAR_IN_SECONDS,   _n_noop( '%s year',   '%s years',   'bbpress' ) ),
+                        array( MONTH_IN_SECONDS,  _n_noop( '%s month',  '%s months',  'bbpress' ) ),
+                        array( WEEK_IN_SECONDS,   _n_noop( '%s week',   '%s weeks',   'bbpress' ) ),
+                        array( DAY_IN_SECONDS,    _n_noop( '%s day',    '%s days',    'bbpress' ) ),
+                        array( HOUR_IN_SECONDS,   _n_noop( '%s hour',   '%s hours',   'bbpress' ) ),
+                        array( MINUTE_IN_SECONDS, _n_noop( '%s minute', '%s minutes', 'bbpress' ) ),
+                        array( 1,                 _n_noop( '%s second', '%s seconds', 'bbpress' ) ),
                 );
 
@@ -681 +681 @@
 
                                 // Set output var
-                                $output = sprintf( _n( $chunks[ $i ][1], $chunks[ $i ][2], $count, 'bbpress' ), bbp_number_format_i18n( $count ) );
+                                $output = sprintf( translate_nooped_plural( $chunks[ $i ][1], $count, 'bbpress' ), bbp_number_format_i18n( $count ) );
 
                                 // Step two: the second chunk
@@ -691 +691 @@
                                         if ( 0 != $count2 ) {
                                                 $output .= _x( ',', 'Separator in time since', 'bbpress' ) . ' ';
-                                                $output .= sprintf( _n( $chunks[ $i + 1 ][1], $chunks[ $i + 1 ][2], $count2, 'bbpress' ), bbp_number_format_i18n( $count2 ) );
+                                                $output .= sprintf( translate_nooped_plural( $chunks[ $i + 1 ][1], $count2, 'bbpress' ), bbp_number_format_i18n( $count2 ) );
                                         }
                                 }