Changeset 42164 for branches/4.9

Timestamp:

11/13/2017 07:08:56 AM (7 years ago)

Author:

westonruter

Message:

I18N: Fix passing singular/plural strings to JS.

This is a temporary solution while waiting for full I18N support in JS.

Props ocean90, dd32, westonruter, Mirucon for testing.
Amends [41376], [41721], [41389].
See #20491.
Fixes #42510 for 4.9.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/script-loader.php (modified) (2 diffs)
• src/wp-includes/widgets/class-wp-widget-custom-html.php (modified) (1 diff)

branches/4.9/src/wp-includes/script-loader.php

@@ -477 +477 @@
         'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
         'saveError' => __( 'Something went wrong. Your change may not have been saved. Please try again. There is also a chance that you may need to manually fix and upload the file over FTP.' ),
-        'lintError' => wp_array_slice_assoc(
+        'lintError' => array(
             /* translators: %d: error count */
-            _n_noop( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.' ),
-            array( 'singular', 'plural' )
+            'singular' => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 1 ),
+            /* translators: %d: error count */
+            'plural' => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
         ),
     ) ) ) );
@@ -581 +582 @@
         // Used for overriding the file types allowed in plupload.
         'allowedFiles'       => __( 'Allowed Files' ),
-        'customCssError'     => wp_array_slice_assoc(
+        'customCssError'     => array(
             /* translators: %d: error count */
-            _n_noop( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.' ),
-            array( 'singular', 'plural' )
+            'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),
+            /* translators: %d: error count */
+            'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
         ),
         'pageOnFrontError' => __( 'Homepage and posts page must be different.' ),
-        'saveBlockedError' => wp_array_slice_assoc(
+        'saveBlockedError' => array(
             /* translators: %s: number of invalid settings */
-            _n_noop( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.' ),
-            array( 'singular', 'plural' )
+            'singular' => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 1 ),
+            /* translators: %s: number of invalid settings */
+            'plural'   => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
         ),
         'scheduleDescription' => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),

branches/4.9/src/wp-includes/widgets/class-wp-widget-custom-html.php

@@ -176 +176 @@
 
         $l10n = array(
-            'errorNotice' => wp_array_slice_assoc(
+            'errorNotice' => array(
                 /* translators: %d: error count */
-                _n_noop( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.' ),
-                array( 'singular', 'plural' )
+                'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),
+                /* translators: %d: error count */
+                'plural' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
             ),
         );