Changeset 52937

Timestamp:

03/15/2022 03:57:57 PM (3 years ago)

Author:

ocean90

Message:

I18N, Script Loader: Don't register empty locale data objects.

For wp.i18n the library ​Jed was initially used which was throwing an error if a domain was not registered but used in a translate function. Later, the library was replaced by ​Tannin which no longer requires the domain to be registered and thus we can avoid printing an empty-ish translations script that doesn't add any translations.

Props jsnajdr.
Fixes #55250.

Location:

trunk

Files:

• src/wp-includes/class.wp-scripts.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/scripts.php (modified) (3 diffs)

trunk/src/wp-includes/class.wp-scripts.php

@@ -600 +600 @@
 
         if ( ! $json_translations ) {
-            // Register empty locale data object to ensure the domain still exists.
-            $json_translations = '{ "locale_data": { "messages": { "": {} } } }';
+            return false;
         }
 

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -741 +741 @@
         $expected .= "wp.i18n.setLocaleData( { 'text direction\u0004ltr': [ 'ltr' ] } );\n";
         $expected .= "</script>\n";
-        $expected .= "<script type='text/javascript' id='wp-a11y-js-translations'>\n";
-        $expected .= "( function( domain, translations ) {\n";
-        $expected .= "  var localeData = translations.locale_data[ domain ] || translations.locale_data.messages;\n";
-        $expected .= "  localeData[\"\"].domain = domain;\n";
-        $expected .= "  wp.i18n.setLocaleData( localeData, domain );\n";
-        $expected .= "} )( \"default\", { \"locale_data\": { \"messages\": { \"\": {} } } } );\n";
-        $expected .= "</script>\n";
         $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/a11y{$suffix}.js' id='wp-a11y-js'></script>\n";
         $expected .= "<script type='text/javascript' src='http://example2.com' id='test-example2-js'></script>\n";
@@ -995 +988 @@
     /**
      * @ticket 45103
+     * @ticket 55250
      */
     public function test_wp_set_script_translations_when_translation_file_does_not_exist() {
@@ -1002 +996 @@
 
         $expected  = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' id='wp-i18n-js'></script>\n";
-        $expected .= str_replace(
-            array(
-                '__DOMAIN__',
-                '__HANDLE__',
-                '__JSON_TRANSLATIONS__',
-            ),
-            array(
-                'admin',
-                'test-example',
-                '{ "locale_data": { "messages": { "": {} } } }',
-            ),
-            $this->wp_scripts_print_translations_output
-        );
         $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js' id='test-example-js'></script>\n";