Changeset 48346

Timestamp:

07/06/2020 07:33:54 PM (6 years ago)

Author:

ocean90

Message:

I18N: Use wp.i18n for translatable strings in wp-admin/js/theme-plugin-editor.js.

This removes the usage of wp_localize_script() for passing translations to the script and instead adds the translatable strings in the script directly through the use of wp.i18n and its utilities.

Fixes #50576.

Location:

trunk/src

Files:

• js/_enqueues/wp/theme-plugin-editor.js (modified) (4 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/js/_enqueues/wp/theme-plugin-editor.js

@@ -11 +11 @@
 wp.themePluginEditor = (function( $ ) {
         'use strict';
-        var component, TreeLinks;
+        var component, TreeLinks,
+                __ = wp.i18n.__, _n = wp.i18n._n, sprintf = wp.i18n.sprintf;
 
         component = {
-                l10n: {
-                        lintError: {
-                                singular: '',
-                                plural: ''
-                        },
-                        saveAlert: '',
-                        saveError: ''
-                },
                 codeEditor: {},
                 instance: null,
@@ -76 +69 @@
                 $( window ).on( 'beforeunload', function() {
                         if ( component.dirty ) {
-                                return component.l10n.saveAlert;
+                                return __( 'The changes you made will be lost if you navigate away from this page.' );
                         }
                         return undefined;
@@ -234 +227 @@
                                 {
                                         code: 'save_error',
-                                        message: component.l10n.saveError
+                                        message: __( '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.' )
                                 },
                                 response,
@@ -376 +369 @@
                  */
                 codeEditorSettings.onUpdateErrorNotice = function onUpdateErrorNotice( errorAnnotations ) {
-                        var message, noticeElement;
+                        var noticeElement;
 
                         component.submitButton.toggleClass( 'disabled', errorAnnotations.length > 0 );
 
                         if ( 0 !== errorAnnotations.length ) {
-                                if ( 1 === errorAnnotations.length ) {
-                                        message = component.l10n.lintError.singular.replace( '%d', '1' );
-                                } else {
-                                        message = component.l10n.lintError.plural.replace( '%d', String( errorAnnotations.length ) );
-                                }
                                 noticeElement = component.addNotice({
                                         code: 'lint_errors',
                                         type: 'error',
-                                        message: message,
+                                        message: sprintf(
+                                                /* translators: %s: Error count. */
+                                                _n(
+                                                        'There is %s error which must be fixed before you can update this file.',
+                                                        'There are %s errors which must be fixed before you can update this file.',
+                                                        errorAnnotations.length
+                                                ),
+                                                String( errorAnnotations.length )
+                                        ),
                                         dismissible: false
                                 });

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

@@ -1014 +1014 @@
         $scripts->add( 'code-editor', "/wp-admin/js/code-editor$suffix.js", array( 'jquery', 'wp-codemirror', 'underscore' ) );
         $scripts->add( 'wp-theme-plugin-editor', "/wp-admin/js/theme-plugin-editor$suffix.js", array( 'wp-util', 'wp-sanitize', 'jquery', 'jquery-ui-core', 'wp-a11y', 'underscore' ) );
-        did_action( 'init' ) && $scripts->add_inline_script(
-                'wp-theme-plugin-editor',
-                sprintf(
-                        'wp.themePluginEditor.l10n = %s;',
-                        wp_json_encode(
-                                array(
-                                        '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' => array(
-                                                /* translators: %d: Error count. */
-                                                '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.
-                                        ),
-                                )
-                        )
-                )
-        );
+        $scripts->set_translations( 'wp-theme-plugin-editor' );
 
         $scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );