<!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>[57350] trunk: I18N: Rename `WP_Translation_Controller::instance()` method to `get_instance()`.</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/57350">57350</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/57350","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-01-25 07:51:12 +0000 (Thu, 25 Jan 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: Rename `WP_Translation_Controller::instance()` method to `get_instance()`.
This improves consistency as `get_instance()` is more commonly used in core.
See <a href="https://core.trac.wordpress.org/ticket/59656">#59656</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswplocaleswitcherphp">trunk/src/wp-includes/class-wp-locale-switcher.php</a></li>
<li><a href="#trunksrcwpincludesl10nclasswptranslationcontrollerphp">trunk/src/wp-includes/l10n/class-wp-translation-controller.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
<li><a href="#trunktestsphpunittestsl10nwpTranslationControllerphp">trunk/tests/phpunit/tests/l10n/wpTranslationController.php</a></li>
<li><a href="#trunktestsphpunittestsl10nwpTranslationsConvertphp">trunk/tests/phpunit/tests/l10n/wpTranslationsConvert.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswplocaleswitcherphp"></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-locale-switcher.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-locale-switcher.php 2024-01-24 23:39:52 UTC (rev 57349)
+++ trunk/src/wp-includes/class-wp-locale-switcher.php 2024-01-25 07:51:12 UTC (rev 57350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_locale = new WP_Locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- WP_Translation_Controller::instance()->set_locale( $locale );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WP_Translation_Controller::get_instance()->set_locale( $locale );
</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"> * Fires when the locale is switched to or restored.
</span></span></pre></div>
<a id="trunksrcwpincludesl10nclasswptranslationcontrollerphp"></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/class-wp-translation-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n/class-wp-translation-controller.php 2024-01-24 23:39:52 UTC (rev 57349)
+++ trunk/src/wp-includes/l10n/class-wp-translation-controller.php 2024-01-25 07:51:12 UTC (rev 57350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,20 +42,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $loaded_files = array();
</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">- * Returns the WP_Translation_Controller singleton.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Container for the main instance of the class.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var WP_Translation_Controller|null
+ */
+ private static $instance = null;
+
+ /**
+ * Utility method to retrieve the main instance of the class.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The instance will be created if it does not exist yet.
+ *
+ * @since 6.5.0
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Translation_Controller
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function instance(): WP_Translation_Controller {
- static $instance;
-
- if ( ! $instance ) {
- $instance = new self();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function get_instance(): WP_Translation_Controller {
+ if ( null === self::$instance ) {
+ self::$instance = new self();
</ins><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">- return $instance;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return self::$instance;
</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="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-01-24 23:39:52 UTC (rev 57349)
+++ trunk/src/wp-includes/l10n.php 2024-01-25 07:51:12 UTC (rev 57350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,7 +797,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = determine_locale();
</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">- $i18n_controller = WP_Translation_Controller::instance();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $i18n_controller = WP_Translation_Controller::get_instance();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensures the correct locale is set as the current one, in case it was filtered.
</span><span class="cx" style="display: block; padding: 0 10px"> $i18n_controller->set_locale( $locale );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -911,7 +911,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Since multiple locales are supported, reloadable text domains don't actually need to be unloaded.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $reloadable ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- WP_Translation_Controller::instance()->unload_textdomain( $domain );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ WP_Translation_Controller::get_instance()->unload_textdomain( $domain );
</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"> if ( isset( $l10n[ $domain ] ) ) {
</span></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2024-01-24 23:39:52 UTC (rev 57349)
+++ trunk/src/wp-settings.php 2024-01-25 07:51:12 UTC (rev 57350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -622,7 +622,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_locale_switcher'] = new WP_Locale_Switcher();
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_locale_switcher']->init();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-WP_Translation_Controller::instance()->set_locale( $locale );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+WP_Translation_Controller::get_instance()->set_locale( $locale );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load the functions for the active theme, for both parent and child theme if applicable.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_get_active_and_valid_themes() as $theme ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nwpTranslationControllerphp"></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/wpTranslationController.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/wpTranslationController.php 2024-01-24 23:39:52 UTC (rev 57349)
+++ trunk/tests/phpunit/tests/l10n/wpTranslationController.php 2024-01-25 07:51:12 UTC (rev 57350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,9 +30,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $compat_instance = $l10n['wp-tests-domain'] ?? 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">- $is_loaded = WP_Translation_Controller::instance()->is_textdomain_loaded( 'wp-tests-domain' );
- $headers = WP_Translation_Controller::instance()->get_headers( 'wp-tests-domain' );
- $entries = WP_Translation_Controller::instance()->get_entries( 'wp-tests-domain' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_loaded = WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'wp-tests-domain' );
+ $headers = WP_Translation_Controller::get_instance()->get_headers( 'wp-tests-domain' );
+ $entries = WP_Translation_Controller::get_instance()->get_entries( 'wp-tests-domain' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $unload_successful = unload_textdomain( 'wp-tests-domain' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_loaded_wp = is_textdomain_loaded( 'wp-tests-domain' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_loaded = WP_Translation_Controller::instance()->is_textdomain_loaded( 'wp-tests-domain' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_loaded = WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'wp-tests-domain' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'override_load_textdomain', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_load_textdomain_prefers_php_files_by_default() {
</span><span class="cx" style="display: block; padding: 0 10px"> $load_successful = load_textdomain( 'wp-tests-domain', DIR_TESTDATA . '/pomo/simple.mo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance = WP_Translation_Controller::instance();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance = WP_Translation_Controller::get_instance();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_loaded = $instance->is_textdomain_loaded( 'wp-tests-domain', 'en_US' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,9 +259,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $compat_instance = $l10n['wp-tests-domain'] ?? 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">- $is_loaded = WP_Translation_Controller::instance()->is_textdomain_loaded( 'wp-tests-domain' );
- $headers = WP_Translation_Controller::instance()->get_headers( 'wp-tests-domain' );
- $entries = WP_Translation_Controller::instance()->get_entries( 'wp-tests-domain' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_loaded = WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'wp-tests-domain' );
+ $headers = WP_Translation_Controller::get_instance()->get_headers( 'wp-tests-domain' );
+ $entries = WP_Translation_Controller::get_instance()->get_entries( 'wp-tests-domain' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( $compat_instance, 'Compat instance was not removed' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $unload_successful, 'Text domain not successfully unloaded' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,13 +281,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $unload_successful = unload_textdomain( 'wp-tests-domain' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_loaded = WP_Translation_Controller::instance()->is_textdomain_loaded( 'wp-tests-domain' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_loaded = WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'wp-tests-domain' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'override_unload_textdomain', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $unload_successful_after = unload_textdomain( 'wp-tests-domain' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_loaded_after = WP_Translation_Controller::instance()->is_textdomain_loaded( 'wp-tests-domain' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_loaded_after = WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'wp-tests-domain' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $unload_successful );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $is_loaded );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,14 +317,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = __( 'Invalid parameter.' );
</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->assertTrue( WP_Translation_Controller::instance()->is_textdomain_loaded() );
- $this->assertTrue( WP_Translation_Controller::instance()->is_textdomain_loaded( 'default', 'es_ES' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( WP_Translation_Controller::get_instance()->is_textdomain_loaded() );
+ $this->assertTrue( WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'default', 'es_ES' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_2 = __( 'Invalid parameter.' );
</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->assertTrue( WP_Translation_Controller::instance()->is_textdomain_loaded( 'default', 'es_ES' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'default', 'es_ES' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Parámetro no válido. ', $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Invalid parameter.', $actual_2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::change_locale
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_switch_to_locale_translations_stay_loaded_custom_textdomain() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'en_US', WP_Translation_Controller::instance()->get_locale() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'en_US', WP_Translation_Controller::get_instance()->get_locale() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,16 +346,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = i18n_plugin_test();
</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->assertSame( 'es_ES', WP_Translation_Controller::instance()->get_locale() );
- $this->assertTrue( WP_Translation_Controller::instance()->is_textdomain_loaded( 'internationalized-plugin', 'es_ES' ) );
- $this->assertTrue( WP_Translation_Controller::instance()->is_textdomain_loaded( 'default', 'es_ES' ) );
- $this->assertFalse( WP_Translation_Controller::instance()->is_textdomain_loaded( 'foo-bar', 'es_ES' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'es_ES', WP_Translation_Controller::get_instance()->get_locale() );
+ $this->assertTrue( WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'internationalized-plugin', 'es_ES' ) );
+ $this->assertTrue( WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'default', 'es_ES' ) );
+ $this->assertFalse( WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'foo-bar', 'es_ES' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_previous_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $after = i18n_plugin_test();
</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->assertTrue( WP_Translation_Controller::instance()->is_textdomain_loaded( 'internationalized-plugin', 'es_ES' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( WP_Translation_Controller::get_instance()->is_textdomain_loaded( 'internationalized-plugin', 'es_ES' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'This is a dummy plugin', $before );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Este es un plugin dummy', $actual );
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nwpTranslationsConvertphp"></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/wpTranslationsConvert.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/wpTranslationsConvert.php 2024-01-24 23:39:52 UTC (rev 57349)
+++ trunk/tests/phpunit/tests/l10n/wpTranslationsConvert.php 2024-01-25 07:51:12 UTC (rev 57350)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,8 +10,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::instance
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_instance() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance = WP_Translation_Controller::instance();
- $instance2 = WP_Translation_Controller::instance();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance = WP_Translation_Controller::get_instance();
+ $instance2 = WP_Translation_Controller::get_instance();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $instance, $instance2 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>