Changeset 31941 for trunk/src/wp-admin/network/themes.php

Timestamp:

03/31/2015 06:44:46 PM (11 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/network/themes.php (modified) (4 diffs)

trunk/src/wp-admin/network/themes.php

@@ -147 +147 @@
                 wp_enqueue_script( 'jquery' );
                 require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                $themes_to_delete = count( $themes );
                 ?>
             <div class="wrap">
-                <?php
-                    $themes_to_delete = count( $themes );
-                    echo '<h2>' . _n( 'Delete Theme', 'Delete Themes', $themes_to_delete ) . '</h2>';
-                ?>
-                <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo _n( 'This theme may be active on other sites in the network.', 'These themes may be active on other sites in the network.', $themes_to_delete ); ?></p></div>
-                <p><?php echo _n( 'You are about to remove the following theme:', 'You are about to remove the following themes:', $themes_to_delete ); ?></p>
+                <?php if ( 1 == $themes_to_delete ) : ?>
+                    <h2><?php _e( 'Delete Theme' ); ?></h2>
+                    <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This theme may be active on other sites in the network.' ); ?></p></div>
+                    <p><?php _e( 'You are about to remove the following theme:' ); ?></p>
+                <?php else : ?>
+                    <h2><?php _e( 'Delete Themes' ); ?></h2>
+                    <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These themes may be active on other sites in the network.' ); ?></p></div>
+                    <p><?php _e( 'You are about to remove the following themes:' ); ?></p>
+                <?php endif; ?>
                     <ul class="ul-disc">
                     <?php
@@ -163 +167 @@
                     ?>
                     </ul>
-                <p><?php _e('Are you sure you wish to delete these themes?'); ?></p>
+                <?php if ( 1 == $themes_to_delete ) : ?>
+                    <p><?php _e( 'Are you sure you wish to delete this theme?' ); ?></p>
+                <?php else : ?>
+                    <p><?php _e( 'Are you sure you wish to delete these themes?' ); ?></p>
+                <?php endif; ?>
                 <form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
                     <input type="hidden" name="verify-delete" value="1" />
@@ -171 +179 @@
                             echo '<input type="hidden" name="checked[]" value="' . esc_attr($theme) . '" />';
                         }
+
+                        wp_nonce_field( 'bulk-themes' );
+
+                        if ( 1 == $themes_to_delete ) {
+                            submit_button( __( 'Yes, Delete this theme' ), 'button', 'submit', false );
+                        } else {
+                            submit_button( __( 'Yes, Delete these themes' ), 'button', 'submit', false );
+                        }
                     ?>
-                    <?php wp_nonce_field('bulk-themes') ?>
-                    <?php submit_button( _n( 'Yes, Delete this theme', 'Yes, Delete these themes', $themes_to_delete ), 'button', 'submit', false ); ?>
                 </form>
                 <?php
@@ -255 +269 @@
 <?php
 if ( isset( $_GET['enabled'] ) ) {
-    $_GET['enabled'] = absint( $_GET['enabled'] );
-    echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>';
+    $enabled = absint( $_GET['enabled'] );
+    if ( 1 == $enabled ) {
+        $message = __( 'Theme enabled.' );
+    } else {
+        $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
+    }
+    echo '<div id="message" class="updated"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
 } elseif ( isset( $_GET['disabled'] ) ) {
-    $_GET['disabled'] = absint( $_GET['disabled'] );
-    echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>';
+    $disabled = absint( $_GET['disabled'] );
+    if ( 1 == $disabled ) {
+        $message = __( 'Theme disabled.' );
+    } else {
+        $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
+    }
+    echo '<div id="message" class="updated"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
 } elseif ( isset( $_GET['deleted'] ) ) {
-    $_GET['deleted'] = absint( $_GET['deleted'] );
-    echo '<div id="message" class="updated"><p>' . sprintf( _nx( 'Theme deleted.', '%s themes deleted.', $_GET['deleted'], 'network' ), number_format_i18n( $_GET['deleted'] ) ) . '</p></div>';
+    $deleted = absint( $_GET['deleted'] );
+    if ( 1 == $deleted ) {
+        $message = __( 'Theme deleted.' );
+    } else {
+        $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
+    }
+    echo '<div id="message" class="updated"><p>' . sprintf( $message, number_format_i18n( $deleted ) ) . '</p></div>';
 } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
     echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>';