<!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>[44404] branches/5.0/tests/phpunit/tests/dependencies/scripts.php: I18N/Script Loader: Support text domains other than "messages".</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/44404">44404</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/44404","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-01-06 17:05:24 +0000 (Sun, 06 Jan 2019)</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/Script Loader: Support text domains other than "messages".
The inline JavaScript added by `WP_Scripts::print_translations()` should check whether `locale_data.$text_domain` exists and fall back to `locale_data.messages` otherwise.
Merge of <a href="https://core.trac.wordpress.org/changeset/44403">[44403]</a> to the 5.0 branch.
Props swissspidy.
Fixes <a href="https://core.trac.wordpress.org/ticket/45441">#45441</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches50srcwpincludesclasswpscriptsphp">branches/5.0/src/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#branches50testsphpunittestsdependenciesscriptsphp">branches/5.0/tests/phpunit/tests/dependencies/scripts.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches50">branches/5.0/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.0
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.0 2019-01-06 16:22:46 UTC (rev 44403)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.0 2019-01-06 17:05:24 UTC (rev 44404)
</ins><a id="branches50"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.0</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">-/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42250-42251,42256-42261,42350,42354,42358,42362,42364-42368,42374,42388,42390,42401,42405,42417,42421,42423-42425,42430,42432-42433,42437,42441,42443-42444,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42642,42648,42652-42653,42665,42676,42687,42695,42697,42701-42702,42711,42713,42719,42722,42726,42728,42733,42739-42740,42744,42758,42772,42791-42792,42801,42812,42814-42815,42817-42819,42823,42830,42837,42839,42841
,42844,42851-42852,42860,42862,42864,42878-42879,42881,42888-42889,42892-42894,42930,42964-42965,42967,42971-42972,42977-42978,42980-42982,42985-42987,42989,42992,42994-42995,42998-42999,43001-43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43042,43044-43049,43051-43063,43065,43081,43085,43087-43089,43091,43104,43116,43118,43120-43121,43123,43125-43126,43131-43132,43135,43137,43139,43145-43148,43150,43154-43155,43158,43160,43162,43166,43168,43170,43172,43175,43180-43181,43183-43185,43189,43191,43193,43195,43197,43199,43201,43203,43206,43208,43210-43212,43216,43218,43220,43222-43223,43226,43228,43230,43232,43234,43236,43238,43242-43243,43245-43246,43248-43251,43256,43259-43260,43263,43265,43267,43269,43274-43275,43278-43279,43282,43284,43286,43290,43293,43299,43303-43304,43313,43315,43317,43331,43337,43343,43350,43353,43356,43361-43363,43365,43367,43370-43371,43373-43376,43379,43388,43390,43435,43437,43439-43440,43446-43447,43451,43454,43457,43460,
43462-43467,43469,43471,43475,43477-43478,43480,43486,43491,43493,43495,43499,43504,43506,43508,43511-43513,43518,43525,43527,43529,43531,43541,43550,43559,43561,43565,43567,43574,43578,43580,43584-43586,43589,43593,43597,43599,43601,43604-43605,43609,43636,43638,43645,43647,43653,43664,43673,44021,44048,44322,44338,44379,44389,44391,44398-44399
</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">+/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42250-42251,42256-42261,42350,42354,42358,42362,42364-42368,42374,42388,42390,42401,42405,42417,42421,42423-42425,42430,42432-42433,42437,42441,42443-42444,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42642,42648,42652-42653,42665,42676,42687,42695,42697,42701-42702,42711,42713,42719,42722,42726,42728,42733,42739-42740,42744,42758,42772,42791-42792,42801,42812,42814-42815,42817-42819,42823,42830,42837,42839,42841
,42844,42851-42852,42860,42862,42864,42878-42879,42881,42888-42889,42892-42894,42930,42964-42965,42967,42971-42972,42977-42978,42980-42982,42985-42987,42989,42992,42994-42995,42998-42999,43001-43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43042,43044-43049,43051-43063,43065,43081,43085,43087-43089,43091,43104,43116,43118,43120-43121,43123,43125-43126,43131-43132,43135,43137,43139,43145-43148,43150,43154-43155,43158,43160,43162,43166,43168,43170,43172,43175,43180-43181,43183-43185,43189,43191,43193,43195,43197,43199,43201,43203,43206,43208,43210-43212,43216,43218,43220,43222-43223,43226,43228,43230,43232,43234,43236,43238,43242-43243,43245-43246,43248-43251,43256,43259-43260,43263,43265,43267,43269,43274-43275,43278-43279,43282,43284,43286,43290,43293,43299,43303-43304,43313,43315,43317,43331,43337,43343,43350,43353,43356,43361-43363,43365,43367,43370-43371,43373-43376,43379,43388,43390,43435,43437,43439-43440,43446-43447,43451,43454,43457,43460,
43462-43467,43469,43471,43475,43477-43478,43480,43486,43491,43493,43495,43499,43504,43506,43508,43511-43513,43518,43525,43527,43529,43531,43541,43550,43559,43561,43565,43567,43574,43578,43580,43584-43586,43589,43593,43597,43599,43601,43604-43605,43609,43636,43638,43645,43647,43653,43664,43673,44021,44048,44322,44338,44379,44389,44391,44398-44399,44403
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches50srcwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/src/wp-includes/class.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/src/wp-includes/class.wp-scripts.php 2019-01-06 16:22:46 UTC (rev 44403)
+++ branches/5.0/src/wp-includes/class.wp-scripts.php 2019-01-06 17:05:24 UTC (rev 44404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,10 +532,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $json_translations = '{ "locale_data": { "messages": { "": {} } } }';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output = '(function( translations ){' .
- 'translations.locale_data.messages[""].domain = "' . $domain . '";' .
- 'wp.i18n.setLocaleData( translations.locale_data.messages, "' . $domain . '" );' .
- '})(' . $json_translations . ');';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = <<<JS
+( function( domain, translations ) {
+ var localeData = translations.locale_data[ domain ] || translations.locale_data.messages;
+ localeData[""].domain = domain;
+ wp.i18n.setLocaleData( localeData, domain );
+} )( "{$domain}", {$json_translations} );
+JS;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $echo ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf( "<script type='text/javascript'>\n%s\n</script>\n", $output );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,7 +549,7 @@
</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"> * Determines script dependencies.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Dependencies::all_deps()
</span></span></pre></div>
<a id="branches50testsphpunittestsdependenciesscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.0/tests/phpunit/tests/dependencies/scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.0/tests/phpunit/tests/dependencies/scripts.php 2019-01-06 16:22:46 UTC (rev 44403)
+++ branches/5.0/tests/phpunit/tests/dependencies/scripts.php 2019-01-06 17:05:24 UTC (rev 44404)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,8 +4,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group scripts
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Dependencies_Scripts extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $old_wp_scripts;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $old_wp_scripts;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $wp_scripts_print_translations_output;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +15,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'wp_default_scripts', 'wp_default_packages' );
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_scripts'] = new WP_Scripts();
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_scripts']->default_version = get_bloginfo( 'version' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->wp_scripts_print_translations_output = <<<JS
+<script type='text/javascript'>
+( function( domain, translations ) {
+ var localeData = translations.locale_data[ domain ] || translations.locale_data.messages;
+ localeData[""].domain = domain;
+ wp.i18n.setLocaleData( localeData, domain );
+} )( "__DOMAIN__", __JSON_TRANSLATIONS__ );
+</script>
+JS;
+ $this->wp_scripts_print_translations_output .= "\n";
</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"> function tearDown() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,11 +788,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example', '/wp-includes/js/script.js', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_script_translations( 'test-example', 'default', DIR_TESTDATA . '/languages' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
- $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
- "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";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>\n";
+ $expected .= str_replace(
+ array(
+ '__DOMAIN__',
+ '__JSON_TRANSLATIONS__',
+ ),
+ array(
+ 'default',
+ file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ),
+ ),
+ $this->wp_scripts_print_translations_output
+ );
</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">@@ -793,11 +813,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'plugin-example', '/wp-content/plugins/my-plugin/js/script.js', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_script_translations( 'plugin-example', 'internationalized-plugin', DIR_TESTDATA . '/languages/plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
- $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
- "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";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>\n";
+ $expected .= str_replace(
+ array(
+ '__DOMAIN__',
+ '__JSON_TRANSLATIONS__',
+ ),
+ array(
+ 'internationalized-plugin',
+ file_get_contents( DIR_TESTDATA . '/languages/plugins/internationalized-plugin-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ),
+ ),
+ $this->wp_scripts_print_translations_output
+ );
</ins><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="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">@@ -811,11 +838,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'theme-example', '/wp-content/themes/my-theme/js/script.js', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_script_translations( 'theme-example', 'internationalized-theme', DIR_TESTDATA . '/languages/themes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
- $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
- "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";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>\n";
+ $expected .= str_replace(
+ array(
+ '__DOMAIN__',
+ '__JSON_TRANSLATIONS__',
+ ),
+ array(
+ 'internationalized-theme',
+ file_get_contents( DIR_TESTDATA . '/languages/themes/internationalized-theme-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ),
+ ),
+ $this->wp_scripts_print_translations_output
+ );
</ins><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="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">@@ -829,11 +863,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'script-handle', '/wp-admin/js/script.js', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_script_translations( 'script-handle', 'admin', DIR_TESTDATA . '/languages/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
- $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
- "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";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>\n";
+ $expected .= str_replace(
+ array(
+ '__DOMAIN__',
+ '__JSON_TRANSLATIONS__',
+ ),
+ array(
+ 'admin',
+ file_get_contents( DIR_TESTDATA . '/languages/admin-en_US-script-handle.json' ),
+ ),
+ $this->wp_scripts_print_translations_output
+ );
</ins><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="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">@@ -862,11 +903,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example', '/wp-admin/js/script.js', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_script_translations( 'test-example', 'admin', DIR_TESTDATA . '/languages/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
- $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
- "translations.locale_data.messages[\"\"].domain = \"admin\";" .
- "wp.i18n.setLocaleData( translations.locale_data.messages, \"admin\" );" .
- "})({ \"locale_data\": { \"messages\": { \"\": {} } } });\n</script>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>\n";
+ $expected .= str_replace(
+ array(
+ '__DOMAIN__',
+ '__JSON_TRANSLATIONS__',
+ ),
+ array(
+ 'admin',
+ '{ "locale_data": { "messages": { "": {} } } }',
+ ),
+ $this->wp_scripts_print_translations_output
+ );
</ins><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="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">@@ -878,15 +926,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_set_script_translations_after_register() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'wp-i18n', '/wp-includes/js/dist/wp-i18n.js', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'test-example', '/wp-includes/js/script.js', array(), null );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_script_translations( 'test-example', 'default', DIR_TESTDATA . '/languages' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_script_translations( 'test-example', 'default', DIR_TESTDATA . '/languages' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
- $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
- "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";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>\n";
+ $expected .= str_replace(
+ array(
+ '__DOMAIN__',
+ '__JSON_TRANSLATIONS__',
+ ),
+ array(
+ 'default',
+ file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ),
+ ),
+ $this->wp_scripts_print_translations_output
+ );
</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">@@ -898,15 +953,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_set_script_translations_dependency() {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'wp-i18n', '/wp-includes/js/dist/wp-i18n.js', array(), null );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_register_script( 'test-dependency', '/wp-includes/js/script.js', array(), null );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_set_script_translations( 'test-dependency', 'default', DIR_TESTDATA . '/languages' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_set_script_translations( 'test-dependency', 'default', DIR_TESTDATA . '/languages' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'test-example', '/wp-includes/js/script2.js', array( 'test-dependency' ), null );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
- $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
- "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";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>\n";
+ $expected .= str_replace(
+ array(
+ '__DOMAIN__',
+ '__JSON_TRANSLATIONS__',
+ ),
+ array(
+ 'default',
+ file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ),
+ ),
+ $this->wp_scripts_print_translations_output
+ );
</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"> $expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js'></script>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>