Changeset 31941 for trunk/src/wp-admin/plugins.php

Timestamp:

03/31/2015 06:44:46 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Decouple strings where the singular and plural form are not just the same string with different numbers, but essentially two different strings.

This allows for using proper plural forms in languages with more than two forms, and also resolves string conflicts when the same string is present in both singular and plural form.

fixes #28502.

File:

• trunk/src/wp-admin/plugins.php (modified) (1 diff)

trunk/src/wp-admin/plugins.php

@@ -284 +284 @@
                     }
                     $plugins_to_delete = count( $plugin_info );
-                    echo '<h2>' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '</h2>';
                 ?>
-                <?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
-                <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo _n( 'This plugin may be active on other sites in the network.', 'These plugins may be active on other sites in the network.', $plugins_to_delete ); ?></p></div>
+                <?php if ( 1 == $plugins_to_delete ) : ?>
+                    <h2><?php _e( 'Delete Plugin' ); ?></h2>
+                    <?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
+                        <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
+                    <?php endif; ?>
+                    <p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
+                <?php else: ?>
+                    <h2><?php _e( 'Delete Plugins' ); ?></h2>
+                    <?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
+                        <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
+                    <?php endif; ?>
+                    <p><?php _e( 'You are about to remove the following plugins:' ); ?></p>
                 <?php endif; ?>
-                <p><?php echo _n( 'You are about to remove the following plugin:', 'You are about to remove the following plugins:', $plugins_to_delete ); ?></p>
                     <ul class="ul-disc">
                         <?php