Skip to:
Content

bbPress.org


Ignore:
Timestamp:
11/23/2019 10:42:14 PM (4 years ago)
Author:
johnjamesjacoby
Message:

Locale: use correct singular versions, and format numeric results.

This commit fixes 2 typos causing plural versions of strings to appear where singulars should, and also makes sure that related numeric upgrade routine results are formatted.

Props webaware. Fixes #3290. For 2.7, trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/admin/tools/upgrade.php

    r6927 r6990  
    247247
    248248    // Complete results
    249     $result = sprintf( _n( 'Complete! %d engagements upgraded.', 'Complete! %d engagements upgraded.', $engagements, 'bbpress' ), $engagements );
     249    $result = sprintf( _n( 'Complete! %d engagement upgraded.', 'Complete! %d engagements upgraded.', $engagements, 'bbpress' ), bbp_number_format( $engagements ) );
    250250
    251251    return array( 0, sprintf( $statement, $result ) );
     
    445445
    446446    // Complete results
    447     $result = sprintf( _n( 'Complete! %d favorite upgraded.', 'Complete! %d favorites upgraded.', $total, 'bbpress' ), $total );
     447    $result = sprintf( _n( 'Complete! %d favorite upgraded.', 'Complete! %d favorites upgraded.', $total, 'bbpress' ), bbp_number_format( $total ) );
    448448
    449449    return array( 0, sprintf( $statement, $result ) );
     
    505505
    506506    // Complete results
    507     $result = sprintf( _n( 'Complete! %d topic subscription upgraded.', 'Complete! %d topic subscriptions upgraded.', $total, 'bbpress' ), $total );
     507    $result = sprintf( _n( 'Complete! %d topic subscription upgraded.', 'Complete! %d topic subscriptions upgraded.', $total, 'bbpress' ), bbp_number_format( $total ) );
    508508
    509509    return array( 0, sprintf( $statement, $result ) );
     
    565565
    566566    // Complete results
    567     $result = sprintf( _n( 'Complete! %d forum subscription upgraded.', 'Complete! %d forum subscriptions upgraded.', $total, 'bbpress' ), $total );
     567    $result = sprintf( _n( 'Complete! %d forum subscription upgraded.', 'Complete! %d forum subscriptions upgraded.', $total, 'bbpress' ), bbp_number_format( $total ) );
    568568
    569569    return array( 0, sprintf( $statement, $result ) );
     
    601601
    602602    // Complete results
    603     $result = sprintf( _n( 'Complete! %d favorites deleted.', 'Complete! %d favorites deleted.', $total, 'bbpress' ), $total );
     603    $result = sprintf( _n( 'Complete! %d favorite deleted.', 'Complete! %d favorites deleted.', $total, 'bbpress' ), bbp_number_format( $total ) );
    604604
    605605    return array( 0, sprintf( $statement, $result ) );
     
    637637
    638638    // Complete results
    639     $result = sprintf( _n( 'Complete! %d topic subscription deleted.', 'Complete! %d topic subscriptions deleted.', $total, 'bbpress' ), $total );
     639    $result = sprintf( _n( 'Complete! %d topic subscription deleted.', 'Complete! %d topic subscriptions deleted.', $total, 'bbpress' ), bbp_number_format( $total ) );
    640640
    641641    return array( 0, sprintf( $statement, $result ) );
     
    673673
    674674    // Complete results
    675     $result = sprintf( _n( 'Complete! %d forum subscription deleted.', 'Complete! %d forum subscriptions deleted.', $total, 'bbpress' ), $total );
    676 
    677     return array( 0, sprintf( $statement, $result ) );
    678 }
     675    $result = sprintf( _n( 'Complete! %d forum subscription deleted.', 'Complete! %d forum subscriptions deleted.', $total, 'bbpress' ), bbp_number_format( $total ) );
     676
     677    return array( 0, sprintf( $statement, $result ) );
     678}
Note: See TracChangeset for help on using the changeset viewer.