Changeset 44239

Timestamp:

12/16/2018 10:23:34 PM (8 years ago)

Author:

SergeyBiryukov

Message:

I18N: Set translations for all WordPress packages scripts.

Calls wp_set_script_translations for all packages scripts that have translations. Also correctly sets the domain on the translations.

Props omarreiss, pento, ocean90.
Merges [43878] to trunk.
Fixes #45161.

Location:

trunk

Files:

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

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

@@ -547 +547 @@
 
                 $output = '(function( translations ){' .
-                                          'wp.i18n.setLocaleData( translations.locale_data, "' . $domain . '" );' .
+                                          'translations.locale_data.messages[""].domain = "' . $domain . '";' .
+                                          'wp.i18n.setLocaleData( translations.locale_data.messages, "' . $domain . '" );' .
                                   '})(' . $json_translations . ');';
 

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

@@ -320 +320 @@
                 'i18n'                               => array( 'wp-polyfill' ),
                 'is-shallow-equal'                   => array( 'wp-polyfill' ),
-                'keycodes'                           => array( 'lodash', 'wp-polyfill' ),
+                'keycodes'                           => array( 'lodash', 'wp-polyfill', 'wp-i18n' ),
                 'list-reusable-blocks'               => array(
                         'lodash',
@@ -362 +362 @@
         );
 
+        $package_translations = array(
+                'api-fetch'            => 'default',
+                'blocks'               => 'default',
+                'block-library'        => 'default',
+                'components'           => 'default',
+                'edit-post'            => 'default',
+                'editor'               => 'default',
+                'format-library'       => 'default',
+                'keycodes'             => 'default',
+                'list-reusable-blocks' => 'default',
+                'nux'                  => 'default',
+        );
+
         foreach ( $packages_dependencies as $package => $dependencies ) {
                 $handle = 'wp-' . $package;
@@ -367 +380 @@
 
                 $scripts->add( $handle, $path, $dependencies, false, 1 );
+
+                if ( isset( $package_translations[ $package ] ) ) {
+                        $scripts->set_translations( $handle, $package_translations[ $package ] );
+                }
         }
 }

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

@@ -784 +784 @@
                 $expected  = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
                 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
-                                'wp.i18n.setLocaleData( translations.locale_data, "default" );' .
-                        '})(' . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n";
+                                         'translations.locale_data.messages[""].domain = "default";' .
+                                         'wp.i18n.setLocaleData( translations.locale_data.messages, "default" );' .
+                                         '})(' . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n";
                 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n";
 
@@ -801 +802 @@
                 $expected  = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
                 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
-                                         'wp.i18n.setLocaleData( translations.locale_data, "internationalized-plugin" );' .
+                                         'translations.locale_data.messages[""].domain = "internationalized-plugin";' .
+                                         'wp.i18n.setLocaleData( translations.locale_data.messages, "internationalized-plugin" );' .
                                          '})(' . file_get_contents( DIR_TESTDATA . '/languages/plugins/internationalized-plugin-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ) . ");\n</script>\n";
                 $expected .= "<script type='text/javascript' src='/wp-content/plugins/my-plugin/js/script.js'></script>\n";
@@ -818 +820 @@
                 $expected  = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
                 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
-                                         'wp.i18n.setLocaleData( translations.locale_data, "internationalized-theme" );' .
+                                         'translations.locale_data.messages[""].domain = "internationalized-theme";' .
+                                         'wp.i18n.setLocaleData( translations.locale_data.messages, "internationalized-theme" );' .
                                          '})(' . file_get_contents( DIR_TESTDATA . '/languages/themes/internationalized-theme-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ) . ");\n</script>\n";
                 $expected .= "<script type='text/javascript' src='/wp-content/themes/my-theme/js/script.js'></script>\n";
@@ -835 +838 @@
                 $expected  = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
                 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
-                                         'wp.i18n.setLocaleData( translations.locale_data, "admin" );' .
+                                         'translations.locale_data.messages[""].domain = "admin";' .
+                                         'wp.i18n.setLocaleData( translations.locale_data.messages, "admin" );' .
                                          '})(' . file_get_contents( DIR_TESTDATA . '/languages/admin-en_US-script-handle.json' ) . ");\n</script>\n";
                 $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js'></script>\n";
@@ -887 +891 @@
                 $expected  = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
                 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
-                                         'wp.i18n.setLocaleData( translations.locale_data, "default" );' .
+                                         'translations.locale_data.messages[""].domain = "default";' .
+                                         'wp.i18n.setLocaleData( translations.locale_data.messages, "default" );' .
                                          '})(' . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n";
                 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n";
@@ -906 +911 @@
                 $expected  = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
                 $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
-                                         'wp.i18n.setLocaleData( translations.locale_data, "default" );' .
+                                         'translations.locale_data.messages[""].domain = "default";' .
+                                         'wp.i18n.setLocaleData( translations.locale_data.messages, "default" );' .
                                          '})(' . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n";
                 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n";