<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[44239] trunk: I18N: Set translations for all WordPress packages scripts.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44239">44239</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44239","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-16 22:23:34 +0000 (Sun, 16 Dec 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/changeset/43878">[43878]</a> to trunk.
Fixes <a href="https://core.trac.wordpress.org/ticket/45161">#45161</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpscriptsphp">trunk/src/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunktestsphpunittestsdependenciesscriptsphp">trunk/tests/phpunit/tests/dependencies/scripts.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunk">trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk 2018-12-16 21:18:38 UTC (rev 44238)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk 2018-12-16 22:23:34 UTC (rev 44239)
</ins><a id="trunk"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43860,43862,43867-43877,43879,43881,43887,43892,43898-43900,43902,43904,43909,43912,43926-43929,43954,43956,43961-43963,44014,44017
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43860,43862,43867-43879,43881,43887,43892,43898-43900,43902,43904,43909,43912,43926-43929,43954,43956,43961-43963,44014,44017
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-scripts.php 2018-12-16 21:18:38 UTC (rev 44238)
+++ trunk/src/wp-includes/class.wp-scripts.php 2018-12-16 22:23:34 UTC (rev 44239)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,7 +546,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '(function( translations ){' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp.i18n.setLocaleData( translations.locale_data, "' . $domain . '" );' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'translations.locale_data.messages[""].domain = "' . $domain . '";' .
+ 'wp.i18n.setLocaleData( translations.locale_data.messages, "' . $domain . '" );' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '})(' . $json_translations . ');';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $echo ) {
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2018-12-16 21:18:38 UTC (rev 44238)
+++ trunk/src/wp-includes/script-loader.php 2018-12-16 22:23:34 UTC (rev 44239)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'html-entities' => array( 'wp-polyfill' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n' => array( 'wp-polyfill' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'is-shallow-equal' => array( 'wp-polyfill' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'keycodes' => array( 'lodash', 'wp-polyfill' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keycodes' => array( 'lodash', 'wp-polyfill', 'wp-i18n' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'list-reusable-blocks' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'lodash',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-api-fetch',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,11 +361,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcount' => array( 'wp-polyfill' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $packages_dependencies as $package => $dependencies ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $handle = 'wp-' . $package;
</span><span class="cx" style="display: block; padding: 0 10px"> $path = "/wp-includes/js/dist/$package$suffix.js";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( $handle, $path, $dependencies, false, 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( isset( $package_translations[ $package ] ) ) {
+ $scripts->set_translations( $handle, $package_translations[ $package ] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsdependenciesscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dependencies/scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/scripts.php 2018-12-16 21:18:38 UTC (rev 44238)
+++ trunk/tests/phpunit/tests/dependencies/scripts.php 2018-12-16 22:23:34 UTC (rev 44239)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,8 +783,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp.i18n.setLocaleData( translations.locale_data, "default" );' .
- '})(' . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '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";
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,7 +801,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp.i18n.setLocaleData( translations.locale_data, "internationalized-plugin" );' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'translations.locale_data.messages[""].domain = "internationalized-plugin";' .
+ 'wp.i18n.setLocaleData( translations.locale_data.messages, "internationalized-plugin" );' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '})(' . file_get_contents( DIR_TESTDATA . '/languages/plugins/internationalized-plugin-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ) . ");\n</script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-content/plugins/my-plugin/js/script.js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -817,7 +819,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp.i18n.setLocaleData( translations.locale_data, "internationalized-theme" );' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'translations.locale_data.messages[""].domain = "internationalized-theme";' .
+ 'wp.i18n.setLocaleData( translations.locale_data.messages, "internationalized-theme" );' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '})(' . file_get_contents( DIR_TESTDATA . '/languages/themes/internationalized-theme-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ) . ");\n</script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-content/themes/my-theme/js/script.js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,7 +837,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp.i18n.setLocaleData( translations.locale_data, "admin" );' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'translations.locale_data.messages[""].domain = "admin";' .
+ 'wp.i18n.setLocaleData( translations.locale_data.messages, "admin" );' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '})(' . file_get_contents( DIR_TESTDATA . '/languages/admin-en_US-script-handle.json' ) . ");\n</script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,7 +890,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp.i18n.setLocaleData( translations.locale_data, "default" );' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'translations.locale_data.messages[""].domain = "default";' .
+ 'wp.i18n.setLocaleData( translations.locale_data.messages, "default" );' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '})(' . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,7 +910,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp.i18n.setLocaleData( translations.locale_data, "default" );' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'translations.locale_data.messages[""].domain = "default";' .
+ 'wp.i18n.setLocaleData( translations.locale_data.messages, "default" );' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '})(' . file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ) . ");\n</script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js'></script>\n";
</span></span></pre>
</div>
</div>
</body>
</html>