Changeset 58064

Timestamp:

04/30/2024 08:53:51 AM (4 months ago)

Author:

swissspidy

Message:

I18N: Fix plural usage in wp_print_admin_notice_templates().

Moves the translatable strings from the JS template defined in PHP to the updates.js script, where _n() can be used as recommended.

Props ideag, SergeyBiryukov, daledupreez, audrasjb, ocean90, swissspidy.
Fixes #37287.

Location:

trunk/src

Files:

• js/_enqueues/wp/updates.js (modified) (1 diff)
• wp-admin/includes/update.php (modified) (2 diffs)

trunk/src/js/_enqueues/wp/updates.js

@@ -2939 +2939 @@
                 wp.updates.adminNotice = wp.template( 'wp-bulk-updates-admin-notice' );
 
+                var successMessage = null;
+
+                if ( success ) {
+                    if ( 'plugin' === response.update ) {
+                        successMessage = sprintf(
+                            /* translators: %s: Number of plugins. */
+                            _n( '%s plugin successfully updated.', '%s plugins successfully updated.', success ),
+                            success
+                        );
+                    } else {
+                        successMessage = sprintf(
+                            /* translators: %s: Number of themes. */
+                            _n( '%s theme successfully updated.', '%s themes successfully updated.', success ),
+                            success
+                        );
+                    }
+                }
+
+                var errorMessage = null;
+
+                if ( error ) {
+                    errorMessage = sprintf(
+                        /* translators: %s: Number of failed updates. */
+                        _n( '%s update failed.', '%s updates failed.', error ),
+                        error
+                    );
+                }
+
                 wp.updates.addAdminNotice( {
                     id:            'bulk-action-notice',
                     className:     'bulk-action-notice',
-                    successes:     success,
-                    errors:        error,
-                    errorMessages: errorMessages,
-                    type:          response.update
+                    successMessage: successMessage,
+                    errorMessage:   errorMessage,
+                    errorMessages:  errorMessages,
+                    type:           response.update
                 } );
 

trunk/src/wp-admin/includes/update.php

@@ -924 +924 @@
     </script>
     <script id="tmpl-wp-bulk-updates-admin-notice" type="text/html">
-        <div id="{{ data.id }}" class="{{ data.className }} notice <# if ( data.errors ) { #>notice-error<# } else { #>notice-success<# } #>">
+        <div id="{{ data.id }}" class="{{ data.className }} notice <# if ( data.errorMessage ) { #>notice-error<# } else { #>notice-success<# } #>">
             <p>
-                <# if ( data.successes ) { #>
-                    <# if ( 1 === data.successes ) { #>
-                        <# if ( 'plugin' === data.type ) { #>
-                            <?php
-                            /* translators: %s: Number of plugins. */
-                            printf( __( '%s plugin successfully updated.' ), '{{ data.successes }}' );
-                            ?>
-                        <# } else { #>
-                            <?php
-                            /* translators: %s: Number of themes. */
-                            printf( __( '%s theme successfully updated.' ), '{{ data.successes }}' );
-                            ?>
-                        <# } #>
-                    <# } else { #>
-                        <# if ( 'plugin' === data.type ) { #>
-                            <?php
-                            /* translators: %s: Number of plugins. */
-                            printf( __( '%s plugins successfully updated.' ), '{{ data.successes }}' );
-                            ?>
-                        <# } else { #>
-                            <?php
-                            /* translators: %s: Number of themes. */
-                            printf( __( '%s themes successfully updated.' ), '{{ data.successes }}' );
-                            ?>
-                        <# } #>
-                    <# } #>
+                <# if ( data.successMessage ) { #>
+                    {{{ data.successMessage }}}
                 <# } #>
-                <# if ( data.errors ) { #>
+                <# if ( data.errorMessage ) { #>
                     <button class="button-link bulk-action-errors-collapsed" aria-expanded="false">
-                        <# if ( 1 === data.errors ) { #>
-                            <?php
-                            /* translators: %s: Number of failed updates. */
-                            printf( __( '%s update failed.' ), '{{ data.errors }}' );
-                            ?>
-                        <# } else { #>
-                            <?php
-                            /* translators: %s: Number of failed updates. */
-                            printf( __( '%s updates failed.' ), '{{ data.errors }}' );
-                            ?>
-                        <# } #>
+                        {{{ data.errorMessage }}}
                         <span class="screen-reader-text">
                             <?php
@@ -976 +942 @@
                 <# } #>
             </p>
-            <# if ( data.errors ) { #>
+            <# if ( data.errorMessages ) { #>
                 <ul class="bulk-action-errors hidden">
                     <# _.each( data.errorMessages, function( errorMessage ) { #>