<!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>[59430] trunk: i18n: Account for `load_*_textdomain()` after JIT loading.</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/59430">59430</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/59430","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-11-20 02:48:40 +0000 (Wed, 20 Nov 2024)</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: Account for `load_*_textdomain()` after JIT loading.
When `load_*_textdomain()` functions are called after WordPress has already attempted just-in-time loading of translations, nothing happens.
This updates the related logic to retry translation loading when a custom path is set to ensure all translations are available.
Additionally, this also fixes cases where an `en_US.mo` file is provided with non-English strings to override the default language.
Follow up to <a href="https://core.trac.wordpress.org/changeset/59157">[59157]</a>.
Props swissspidy, peterwilsoncc, desrosj, apermo, sergeybiryukov, wildworks, tigriweb, twvania, looswebstudio, stimul, audrasjb, finntown, bluantinoo, timwhitlock, albigdd.
See <a href="https://core.trac.wordpress.org/ticket/62337">#62337</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswptextdomainregistryphp">trunk/src/wp-includes/class-wp-textdomain-registry.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunktestsphpunitdatapluginscustominternationalizedplugincustominternationalizedpluginphp">trunk/tests/phpunit/data/plugins/custom-internationalized-plugin/custom-internationalized-plugin.php</a></li>
<li><a href="#trunktestsphpunittestsl10nloadTextdomainJustInTimephp">trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php</a></li>
<li><a href="#trunktestsphpunittestsl10nwpLocaleSwitcherphp">trunk/tests/phpunit/tests/l10n/wpLocaleSwitcher.php</a></li>
<li><a href="#trunktestsphpunittestsl10nwpTextdomainRegistryphp">trunk/tests/phpunit/tests/l10n/wpTextdomainRegistry.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswptextdomainregistryphp"></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-textdomain-registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-textdomain-registry.php 2024-11-20 01:57:00 UTC (rev 59429)
+++ trunk/src/wp-includes/class-wp-textdomain-registry.php 2024-11-20 02:48:40 UTC (rev 59430)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,6 +153,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path Language directory path.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_custom_path( $domain, $path ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If just-in-time loading was triggered before, reset the entry so it can be tried again.
+
+ if ( isset( $this->all[ $domain ] ) ) {
+ $this->all[ $domain ] = array_filter( $this->all[ $domain ] );
+ }
+
+ if ( empty( $this->current[ $domain ] ) ) {
+ unset( $this->current[ $domain ] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->custom_paths[ $domain ] = rtrim( $path, '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If no path is found for the given locale and a custom path has been set
</span><span class="cx" style="display: block; padding: 0 10px"> * using load_plugin_textdomain/load_theme_textdomain, use that one.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'en_US' !== $locale && isset( $this->custom_paths[ $domain ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $this->custom_paths[ $domain ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fallback_location = rtrim( $this->custom_paths[ $domain ], '/' ) . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set( $domain, $locale, $fallback_location );
</span><span class="cx" style="display: block; padding: 0 10px"> return $fallback_location;
</span></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></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/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2024-11-20 01:57:00 UTC (rev 59429)
+++ trunk/src/wp-includes/l10n.php 2024-11-20 02:48:40 UTC (rev 59430)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -985,6 +985,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0 The function now tries to load the .mo file from the languages directory first.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.7.0 Translations are no longer immediately loaded, but handed off to the just-in-time loading mechanism.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry.
+ * @global array<string, WP_Translations|NOOP_Translations> $l10n An array of all currently loaded text domains.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Unique identifier for retrieving translated strings
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|false $deprecated Optional. Deprecated. Use the $plugin_rel_path parameter instead.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -994,7 +997,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var WP_Textdomain_Registry $wp_textdomain_registry */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_textdomain_registry;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @var array<string, WP_Translations|NOOP_Translations> $l10n */
+ global $wp_textdomain_registry, $l10n;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $domain ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1011,6 +1015,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_textdomain_registry->set_custom_path( $domain, $path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If just-in-time loading was triggered before, reset the entry so it can be tried again.
+ if ( isset( $l10n[ $domain ] ) && $l10n[ $domain ] instanceof NOOP_Translations ) {
+ unset( $l10n[ $domain ] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1022,6 +1031,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.7.0 Translations are no longer immediately loaded, but handed off to the just-in-time loading mechanism.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array<string, WP_Translations|NOOP_Translations> $l10n An array of all currently loaded text domains.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Text domain. Unique identifier for retrieving translated strings.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $mu_plugin_rel_path Optional. Relative to `WPMU_PLUGIN_DIR` directory in which the .mo
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1030,7 +1040,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var WP_Textdomain_Registry $wp_textdomain_registry */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_textdomain_registry;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @var array<string, WP_Translations|NOOP_Translations> $l10n */
+ global $wp_textdomain_registry, $l10n;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $domain ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1040,6 +1051,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_textdomain_registry->set_custom_path( $domain, $path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If just-in-time loading was triggered before, reset the entry so it can be tried again.
+ if ( isset( $l10n[ $domain ] ) && $l10n[ $domain ] instanceof NOOP_Translations ) {
+ unset( $l10n[ $domain ] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1056,6 +1072,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.7.0 Translations are no longer immediately loaded, but handed off to the just-in-time loading mechanism.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global array<string, WP_Translations|NOOP_Translations> $l10n An array of all currently loaded text domains.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain Text domain. Unique identifier for retrieving translated strings.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|false $path Optional. Path to the directory containing the .mo file.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1064,7 +1081,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function load_theme_textdomain( $domain, $path = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var WP_Textdomain_Registry $wp_textdomain_registry */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_textdomain_registry;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @var array<string, WP_Translations|NOOP_Translations> $l10n */
+ global $wp_textdomain_registry, $l10n;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $domain ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1076,6 +1094,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_textdomain_registry->set_custom_path( $domain, $path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If just-in-time loading was triggered before, reset the entry so it can be tried again.
+ if ( isset( $l10n[ $domain ] ) && $l10n[ $domain ] instanceof NOOP_Translations ) {
+ unset( $l10n[ $domain ] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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="trunktestsphpunitdatapluginscustominternationalizedplugincustominternationalizedpluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/plugins/custom-internationalized-plugin/custom-internationalized-plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/plugins/custom-internationalized-plugin/custom-internationalized-plugin.php 2024-11-20 01:57:00 UTC (rev 59429)
+++ trunk/tests/phpunit/data/plugins/custom-internationalized-plugin/custom-internationalized-plugin.php 2024-11-20 02:48:40 UTC (rev 59430)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,8 +7,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Text Domain: custom-internationalized-plugin
</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">-load_plugin_textdomain( 'custom-internationalized-plugin', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function custom_i18n_load_textdomain() {
+ load_plugin_textdomain( 'custom-internationalized-plugin', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'init', 'custom_i18n_load_textdomain' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> function custom_i18n_plugin_test() {
</span><span class="cx" style="display: block; padding: 0 10px"> return __( 'This is a dummy plugin', 'custom-internationalized-plugin' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nloadTextdomainJustInTimephp"></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/l10n/loadTextdomainJustInTime.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php 2024-11-20 01:57:00 UTC (rev 59429)
+++ trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php 2024-11-20 02:48:40 UTC (rev 59430)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,4 +342,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_textdomain_loaded( $textdomain ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $filter->get_call_count() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 44937
+ * @ticket 62337
+ *
+ * @covers ::load_plugin_textdomain
+ * @covers ::is_textdomain_loaded
+ * @covers WP_Textdomain_Registry::set_custom_path
+ */
+ public function test_plugin_translation_should_be_translated_when_calling_load_plugin_textdomain_too_late() {
+ require_once DIR_TESTDATA . '/plugins/custom-internationalized-plugin/custom-internationalized-plugin.php';
+
+ add_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
+
+ $is_textdomain_loaded_before = is_textdomain_loaded( 'custom-internationalized-plugin' );
+ $output_before = custom_i18n_plugin_test();
+
+ $is_textdomain_loaded_middle = is_textdomain_loaded( 'custom-internationalized-plugin' );
+
+ custom_i18n_load_textdomain();
+
+ $output_after = custom_i18n_plugin_test();
+ $is_textdomain_loaded_after = is_textdomain_loaded( 'custom-internationalized-plugin' );
+
+ $this->assertFalse( $is_textdomain_loaded_before );
+ $this->assertFalse( $is_textdomain_loaded_middle );
+ $this->assertSame( 'This is a dummy plugin', $output_before );
+ $this->assertSame( 'Das ist ein Dummy Plugin', $output_after );
+ $this->assertTrue( $is_textdomain_loaded_after );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nwpLocaleSwitcherphp"></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/l10n/wpLocaleSwitcher.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/wpLocaleSwitcher.php 2024-11-20 01:57:00 UTC (rev 59429)
+++ trunk/tests/phpunit/tests/l10n/wpLocaleSwitcher.php 2024-11-20 02:48:40 UTC (rev 59430)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,6 +493,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once DIR_TESTDATA . '/plugins/custom-internationalized-plugin/custom-internationalized-plugin.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ custom_i18n_load_textdomain();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = custom_i18n_plugin_test();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_locale( 'es_ES' );
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nwpTextdomainRegistryphp"></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/l10n/wpTextdomainRegistry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/wpTextdomainRegistry.php 2024-11-20 01:57:00 UTC (rev 59429)
+++ trunk/tests/phpunit/tests/l10n/wpTextdomainRegistry.php 2024-11-20 02:48:40 UTC (rev 59430)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,9 +39,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->instance->has( 'foo' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'Incorrect availability status for textdomain with custom path'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame(
+ WP_LANG_DIR . '/bar/',
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->instance->get( 'foo', 'en_US' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Should not return custom path for textdomain and en_US locale'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Should return custom path for textdomain and en_US locale'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> WP_LANG_DIR . '/bar/',
</span></span></pre>
</div>
</div>
</body>
</html>