Changeset 57654

Timestamp:

02/18/2024 10:14:04 PM (2 years ago)

Author:

peterwilsoncc

Message:

Script Loader: Switch to JavaScript translations.

Update JavaScript files for tag suggestions and the TinyMCE link plugin to use client side translations. This allows for _n() to be used for strings requiring singular and plural versions in which the correct form is only known client side.

Props audrasjb, chaion07, costdev, hellofromtonya, johnbillion, marybaum, nicolefurlan, oglekler, rebasaurus, rsiddharth, sergeybiryukov, shaampk1, shahariaazam, swissspidy, tobifjellner.
Fixes #48244.

Location:

trunk/src

Files:

• js/_enqueues/admin/common.js (modified) (1 diff)
• js/_enqueues/admin/tags-suggest.js (modified) (2 diffs)
• js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (3 diffs)

trunk/src/js/_enqueues/admin/common.js

@@ -353 +353 @@
 
 window.setPostThumbnailL10n = deprecateL10nObject( 'setPostThumbnailL10n', window.setPostThumbnailL10n, '5.5.0' );
+
+/**
+ * Removed in 6.5.0, needed for back-compatibility.
+ *
+ * @since 4.5.0
+ * @deprecated 6.5.0
+ */
+window.uiAutocompleteL10n = window.uiAutocompleteL10n || {
+        noResults: '',
+        oneResult: '',
+        manyResults: '',
+        itemSelected: ''
+};
+
+window.uiAutocompleteL10n = deprecateL10nObject( 'uiAutocompleteL10n', window.uiAutocompleteL10n, '6.5.0' );
 
 /**

trunk/src/js/_enqueues/admin/tags-suggest.js

@@ -5 +5 @@
  */
 ( function( $ ) {
-        if ( typeof window.uiAutocompleteL10n === 'undefined' ) {
-                return;
-        }
-
         var tempID = 0;
         var separator = wp.i18n._x( ',', 'tag delimiter' ) || ',';
+        var __ = wp.i18n.__,
+            _n = wp.i18n._n,
+            sprintf = wp.i18n.sprintf;
 
         function split( val ) {
@@ -140 +139 @@
                         },
                         messages: {
-                                noResults: window.uiAutocompleteL10n.noResults,
+                                noResults: __( 'No results found.' ),
                                 results: function( number ) {
-                                        if ( number > 1 ) {
-                                                return window.uiAutocompleteL10n.manyResults.replace( '%d', number );
-                                        }
-
-                                        return window.uiAutocompleteL10n.oneResult;
+                                        return sprintf(
+                                                /* translators: %d: Number of search results found. */
+                                                _n(
+                                                        '%d result found. Use up and down arrow keys to navigate.',
+                                                        '%d results found. Use up and down arrow keys to navigate.',
+                                                        number
+                                                ),
+                                                number
+                                        );
                                 }
                         }

trunk/src/js/_enqueues/vendor/tinymce/plugins/wplink/plugin.js

@@ -99 +99 @@
                 var speak = ( typeof window.wp !== 'undefined' && window.wp.a11y && window.wp.a11y.speak ) ? window.wp.a11y.speak : function() {};
                 var hasLinkError = false;
+                var __ = window.wp.i18n.__;
+                var _n = window.wp.i18n._n;
+                var sprintf = window.wp.i18n.sprintf;
 
                 function getSelectedLink() {
@@ -458 +461 @@
                                                 },
                                                 messages: {
-                                                        noResults: ( typeof window.uiAutocompleteL10n !== 'undefined' ) ? window.uiAutocompleteL10n.noResults : '',
+                                                        noResults: __( 'No results found.' ) ,
                                                         results: function( number ) {
-                                                                if ( typeof window.uiAutocompleteL10n !== 'undefined' ) {
-                                                                        if ( number > 1 ) {
-                                                                                return window.uiAutocompleteL10n.manyResults.replace( '%d', number );
-                                                                        }
-
-                                                                        return window.uiAutocompleteL10n.oneResult;
-                                                                }
+                                                                return sprintf(
+                                                                        /* translators: %d: Number of search results found. */
+                                                                        _n(
+                                                                                '%d result found. Use up and down arrow keys to navigate.',
+                                                                                '%d results found. Use up and down arrow keys to navigate.',
+                                                                                number
+                                                                        ),
+                                                                        number
+                                                                );
                                                         }
                                                 }

trunk/src/wp-includes/script-loader.php

@@ -932 +932 @@
         $scripts->add( 'jquery-ui-position', false, array( 'jquery-ui-core' ), '1.13.2', 1 );
         $scripts->add( 'jquery-ui-widget', false, array( 'jquery-ui-core' ), '1.13.2', 1 );
-
-        // Strings for 'jquery-ui-autocomplete' live region messages.
-        did_action( 'init' ) && $scripts->localize(
-                'jquery-ui-autocomplete',
-                'uiAutocompleteL10n',
-                array(
-                        'noResults'    => __( 'No results found.' ),
-                        /* translators: Number of results found when using jQuery UI Autocomplete. */
-                        'oneResult'    => __( '1 result found. Use up and down arrow keys to navigate.' ),
-                        /* translators: %d: Number of results found when using jQuery UI Autocomplete. */
-                        'manyResults'  => __( '%d results found. Use up and down arrow keys to navigate.' ),
-                        'itemSelected' => __( 'Item selected.' ),
-                )
-        );
 
         // Deprecated, not used in core, most functionality is included in jQuery 1.3.
@@ -1248 +1234 @@
         $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array( 'hoverintent-js' ), false, 1 );
 
-        $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
+        $scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'common', 'jquery', 'wp-a11y', 'wp-i18n' ), false, 1 );
+        $scripts->set_translations( 'wplink' );
         did_action( 'init' ) && $scripts->localize(
                 'wplink',
@@ -1426 +1413 @@
                 $scripts->set_translations( 'tags-box' );
 
-                $scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'jquery-ui-autocomplete', 'wp-a11y' ), false, 1 );
+                $scripts->add( 'tags-suggest', "/wp-admin/js/tags-suggest$suffix.js", array( 'common', 'jquery-ui-autocomplete', 'wp-a11y', 'wp-i18n' ), false, 1 );
                 $scripts->set_translations( 'tags-suggest' );