<!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>[49566] trunk: I18N: Revert [49236] for now to investigate alternative implementations.</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/49566">49566</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/49566","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>2020-11-12 14:41:19 +0000 (Thu, 12 Nov 2020)</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: Revert <a href="https://core.trac.wordpress.org/changeset/49236">[49236]</a> for now to investigate alternative implementations.
See <a href="https://core.trac.wordpress.org/ticket/39210">#39210</a>, <a href="https://core.trac.wordpress.org/ticket/51678">#51678</a>, <a href="https://core.trac.wordpress.org/ticket/26511">#26511</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="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.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="#trunktestsphpunitdatalanguagespluginsinternationalizedpluginde_DEmo">trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-de_DE.mo</a></li>
<li><a href="#trunktestsphpunitdatalanguagespluginsinternationalizedpluginde_DEpo">trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-de_DE.po</a></li>
<li><a href="#trunktestsphpunitdatalanguagesthemesinternationalizedthemede_DEmo">trunk/tests/phpunit/data/languages/themes/internationalized-theme-de_DE.mo</a></li>
<li><a href="#trunktestsphpunitdatalanguagesthemesinternationalizedthemede_DEpo">trunk/tests/phpunit/data/languages/themes/internationalized-theme-de_DE.po</a></li>
<li><a href="#trunktestsphpunitdatapluginshellophp">trunk/tests/phpunit/data/plugins/hello.php</a></li>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPluginphp">trunk/tests/phpunit/tests/admin/includesPlugin.php</a></li>
<li><a href="#trunktestsphpunittestsl10nloadTextdomainphp">trunk/tests/phpunit/tests/l10n/loadTextdomain.php</a></li>
<li><a href="#trunktestsphpunittestsl10nloadTextdomainJustInTimephp">trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php</a></li>
<li><a href="#trunktestsphpunittestsl10nlocaleSwitcherphp">trunk/tests/phpunit/tests/l10n/localeSwitcher.php</a></li>
<li><a href="#trunktestsphpunitteststhemethemeDirphp">trunk/tests/phpunit/tests/theme/themeDir.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswptextdomainregistryphp">trunk/src/wp-includes/class-wp-textdomain-registry.php</a></li>
<li><a href="#trunktestsphpunitdatalanguagespluginsinternationalizedplugines_ESmo">trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-es_ES.mo</a></li>
<li><a href="#trunktestsphpunitdatalanguagespluginsinternationalizedplugines_ESpo">trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-es_ES.po</a></li>
<li>trunk/tests/phpunit/data/plugins/custom-internationalized-plugin/</li>
<li>trunk/tests/phpunit/data/themedir1/custom-internationalized-theme/</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 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/src/wp-includes/class-wp-locale-switcher.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,12 +196,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> load_default_textdomain( $locale );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $domains as $domain ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The default text domain is handled by `load_default_textdomain()`.
</del><span class="cx" style="display: block; padding: 0 10px"> if ( 'default' === $domain ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- unload_textdomain( $domain, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unload_textdomain( $domain );
</ins><span class="cx" style="display: block; padding: 0 10px"> get_translations_for_domain( $domain );
</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">@@ -219,11 +218,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $locale The locale to change to.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function change_locale( $locale ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_locale;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reset translation availability information.
+ _get_path_to_translation( null, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->load_translations( $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_locale = new WP_Locale();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $GLOBALS['wp_locale'] = new WP_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="trunksrcwpincludesclasswptextdomainregistryphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: 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 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/src/wp-includes/class-wp-textdomain-registry.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,130 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * Locale API: WP_Textdomain_Registry class
- *
- * @package WordPress
- * @subpackage i18n
- * @since 5.6.0
- */
-
-/**
- * Core class used for registering text domains.
- *
- * @since 5.6.0
- */
-class WP_Textdomain_Registry {
- /**
- * List of domains and their language directory paths.
- *
- * @since 5.6.0
- *
- * @var array
- */
- protected $domains = array();
-
- /**
- * Holds a cached list of available .mo files to improve performance.
- *
- * @since 5.6.0
- *
- * @var array
- */
- protected $cached_mo_files;
-
- /**
- * Returns the MO file path for a specific domain.
- *
- * @since 5.6.0
- *
- * @param string $domain Text domain.
- * @return string|false MO file path or false if there is none available.
- */
- public function get( $domain ) {
- if ( isset( $this->domains[ $domain ] ) ) {
- return $this->domains[ $domain ];
- }
-
- return $this->get_path_from_lang_dir( $domain );
- }
-
- /**
- * Sets the MO file path for a specific domain.
- *
- * @since 5.6.0
- *
- * @param string $domain Text domain.
- * @param string|false $path Language directory path or false if there is none available.
- */
- public function set( $domain, $path ) {
- $this->domains[ $domain ] = $path ? trailingslashit( $path ) : false;
- }
-
- /**
- * Resets the registry state.
- *
- * @since 5.6.0
- */
- public function reset() {
- $this->cached_mo_files = null;
- $this->domains = array();
- }
-
- /**
- * Gets the path to a translation file in the languages directory for the current locale.
- *
- * @since 5.6.0
- *
- * @param string $domain Text domain.
- * @return string|false MO file path or false if there is none available.
- */
- private function get_path_from_lang_dir( $domain ) {
- if ( null === $this->cached_mo_files ) {
- $this->cached_mo_files = array();
-
- $this->set_cached_mo_files();
- }
-
- $locale = determine_locale();
- $mofile = "{$domain}-{$locale}.mo";
-
- $path = WP_LANG_DIR . '/plugins/' . $mofile;
- if ( in_array( $path, $this->cached_mo_files, true ) ) {
- $path = WP_LANG_DIR . '/plugins/';
- $this->set( $domain, $path );
-
- return $path;
- }
-
- $path = WP_LANG_DIR . '/themes/' . $mofile;
- if ( in_array( $path, $this->cached_mo_files, true ) ) {
- $path = WP_LANG_DIR . '/themes/';
- $this->set( $domain, $path );
-
- return $path;
- }
-
- $this->set( $domain, false );
-
- return false;
- }
-
- /**
- * Reads and caches all available MO files from the plugins and themes language directories.
- *
- * @since 5.6.0
- */
- protected function set_cached_mo_files() {
- $locations = array(
- WP_LANG_DIR . '/plugins',
- WP_LANG_DIR . '/themes',
- );
-
- foreach ( $locations as $location ) {
- $mo_files = glob( $location . '/*.mo' );
-
- if ( $mo_files ) {
- $this->cached_mo_files = array_merge( $this->cached_mo_files, $mo_files );
- }
- }
- }
-}
</del></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/src/wp-includes/deprecated.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4134,85 +4134,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function addslashes_strings_only( $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return is_string( $value ) ? addslashes( $value ) : $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/**
- * Gets the path to a translation file for loading a textdomain just in time.
- *
- * Caches the retrieved results internally.
- *
- * @since 4.7.0
- * @deprecated 5.6.0
- * @access private
- *
- * @see _load_textdomain_just_in_time()
- *
- * @param string $domain Text domain. Unique identifier for retrieving translated strings.
- * @param bool $reset Whether to reset the internal cache. Used by the switch to locale functionality.
- * @return string|false The path to the translation file or false if no translation file was found.
- */
-function _get_path_to_translation( $domain, $reset = false ) {
- _deprecated_function( __FUNCTION__, '5.6.0', 'WP_Textdomain_Registry' );
-
- static $available_translations = array();
-
- if ( true === $reset ) {
- $available_translations = array();
- }
-
- if ( ! isset( $available_translations[ $domain ] ) ) {
- $available_translations[ $domain ] = _get_path_to_translation_from_lang_dir( $domain );
- }
-
- return $available_translations[ $domain ];
-}
-
-/**
- * Gets the path to a translation file in the languages directory for the current locale.
- *
- * Holds a cached list of available .mo files to improve performance.
- *
- * @since 4.7.0
- * @deprecated 5.6.0
- * @access private
- *
- * @see _get_path_to_translation()
- *
- * @param string $domain Text domain. Unique identifier for retrieving translated strings.
- * @return string|false The path to the translation file or false if no translation file was found.
- */
-function _get_path_to_translation_from_lang_dir( $domain ) {
- _deprecated_function( __FUNCTION__, '5.6.0', 'WP_Textdomain_Registry' );
-
- static $cached_mofiles = null;
-
- if ( null === $cached_mofiles ) {
- $cached_mofiles = array();
-
- $locations = array(
- WP_LANG_DIR . '/plugins',
- WP_LANG_DIR . '/themes',
- );
-
- foreach ( $locations as $location ) {
- $mofiles = glob( $location . '/*.mo' );
- if ( $mofiles ) {
- $cached_mofiles = array_merge( $cached_mofiles, $mofiles );
- }
- }
- }
-
- $locale = determine_locale();
- $mofile = "{$domain}-{$locale}.mo";
-
- $path = WP_LANG_DIR . '/plugins/' . $mofile;
- if ( in_array( $path, $cached_mofiles, true ) ) {
- return $path;
- }
-
- $path = WP_LANG_DIR . '/themes/' . $mofile;
- if ( in_array( $path, $cached_mofiles, true ) ) {
- return $path;
- }
-
- return false;
-}
</del></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 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/src/wp-includes/l10n.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,9 +689,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.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">- * @global MO[] $l10n An array of all currently loaded text domains.
- * @global MO[] $l10n_unloaded An array of all text domains that have been unloaded again.
- * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global MO[] $l10n An array of all currently loaded text domains.
+ * @global MO[] $l10n_unloaded An array of all text domains that have been unloaded again.
</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 $mofile Path to the .mo file.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -698,7 +697,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function load_textdomain( $domain, $mofile ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $l10n, $l10n_unloaded, $wp_textdomain_registry;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $l10n, $l10n_unloaded;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $l10n_unloaded = (array) $l10n_unloaded;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,9 +755,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $l10n[ $domain ] = &$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">- /** @var WP_Textdomain_Registry $wp_textdomain_registry */
- $wp_textdomain_registry->set( $domain, dirname( $mofile ) );
-
</del><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">@@ -766,16 +762,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Unload translations for a text domain.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.6.0 Added the `$reloadable` parameter.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global MO[] $l10n An array of all currently loaded text domains.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global MO[] $l10n_unloaded An array of all text domains that have been unloaded again.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $domain Text domain. Unique identifier for retrieving translated strings.
- * @param bool $reloadable Whether the text domain can be loaded just-in-time again.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $domain Text domain. Unique identifier for retrieving translated strings.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether textdomain was unloaded.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function unload_textdomain( $domain, $reloadable = false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function unload_textdomain( $domain ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $l10n, $l10n_unloaded;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $l10n_unloaded = (array) $l10n_unloaded;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,18 +778,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to override the text domain unloading.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.6.0 Added the `$reloadable` parameter.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $override Whether to override the text domain unloading. Default false.
- * @param string $domain Text domain. Unique identifier for retrieving translated strings.
- * @param bool $reloadable Whether the text domain can be loaded just-in-time again.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $override Whether to override the text domain unloading. Default false.
+ * @param string $domain Text domain. Unique identifier for retrieving translated strings.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_override = apply_filters( 'override_unload_textdomain', false, $domain, $reloadable );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_override = apply_filters( 'override_unload_textdomain', false, $domain );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin_override ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $reloadable ) {
- $l10n_unloaded[ $domain ] = true;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $l10n_unloaded[ $domain ] = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,19 +794,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires before the text domain is unloaded.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.6.0 Added the `$reloadable` parameter.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $domain Text domain. Unique identifier for retrieving translated strings.
- * @param bool $reloadable Whether the text domain can be loaded just-in-time again.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $domain Text domain. Unique identifier for retrieving translated strings.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'unload_textdomain', $domain, $reloadable );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'unload_textdomain', $domain );
</ins><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 class="cx" style="display: block; padding: 0 10px"> unset( $l10n[ $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">- if ( ! $reloadable ) {
- $l10n_unloaded[ $domain ] = true;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $l10n_unloaded[ $domain ] = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -881,8 +867,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True when textdomain is successfully loaded, false otherwise.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_textdomain_registry;
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters a plugin's locale.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -909,9 +893,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = WP_PLUGIN_DIR;
</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">- /* @var WP_Textdomain_Registry $wp_textdomain_registry */
- $wp_textdomain_registry->set( $domain, $path );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return load_textdomain( $domain, $path . '/' . $mofile );
</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">@@ -921,8 +902,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</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"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry.
- *
</del><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="cx" style="display: block; padding: 0 10px"> * file resides. Default empty string.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -929,8 +908,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True when textdomain is successfully loaded, false otherwise.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_textdomain_registry;
-
</del><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/l10n.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = apply_filters( 'plugin_locale', determine_locale(), $domain );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -943,9 +920,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $path = WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_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">- /* @var WP_Textdomain_Registry $wp_textdomain_registry */
- $wp_textdomain_registry->set( $domain, $path );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return load_textdomain( $domain, $path . '/' . $mofile );
</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">@@ -960,8 +934,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</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"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry.
- *
</del><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 $path Optional. Path to the directory containing the .mo file.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default false.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -968,8 +940,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True when textdomain is successfully loaded, false otherwise.
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_textdomain_registry;
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters a theme's locale.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -991,9 +961,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = get_template_directory();
</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">- /* @var WP_Textdomain_Registry $wp_textdomain_registry */
- $wp_textdomain_registry->set( $domain, $path );
-
</del><span class="cx" style="display: block; padding: 0 10px"> return load_textdomain( $domain, $path . '/' . $locale . '.mo' );
</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">@@ -1223,14 +1190,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global MO[] $l10n_unloaded An array of all text domains that have been unloaded again.
- * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @see get_translations_for_domain()
+ * @global MO[] $l10n_unloaded An array of all text domains that have been unloaded again.
</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"> * @return bool True when the textdomain is successfully loaded, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _load_textdomain_just_in_time( $domain ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $l10n_unloaded, $wp_textdomain_registry;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $l10n_unloaded;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $l10n_unloaded = (array) $l10n_unloaded;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1239,24 +1206,88 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- /** @var WP_Textdomain_Registry $wp_textdomain_registry */
- $path = $wp_textdomain_registry->get( $domain );
- if ( ! $path ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $translation_path = _get_path_to_translation( $domain );
+ if ( false === $translation_path ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">+ return load_textdomain( $domain, $translation_path );
+}
+
+/**
+ * Gets the path to a translation file for loading a textdomain just in time.
+ *
+ * Caches the retrieved results internally.
+ *
+ * @since 4.7.0
+ * @access private
+ *
+ * @see _load_textdomain_just_in_time()
+ *
+ * @param string $domain Text domain. Unique identifier for retrieving translated strings.
+ * @param bool $reset Whether to reset the internal cache. Used by the switch to locale functionality.
+ * @return string|false The path to the translation file or false if no translation file was found.
+ */
+function _get_path_to_translation( $domain, $reset = false ) {
+ static $available_translations = array();
+
+ if ( true === $reset ) {
+ $available_translations = array();
+ }
+
+ if ( ! isset( $available_translations[ $domain ] ) ) {
+ $available_translations[ $domain ] = _get_path_to_translation_from_lang_dir( $domain );
+ }
+
+ return $available_translations[ $domain ];
+}
+
+/**
+ * Gets the path to a translation file in the languages directory for the current locale.
+ *
+ * Holds a cached list of available .mo files to improve performance.
+ *
+ * @since 4.7.0
+ * @access private
+ *
+ * @see _get_path_to_translation()
+ *
+ * @param string $domain Text domain. Unique identifier for retrieving translated strings.
+ * @return string|false The path to the translation file or false if no translation file was found.
+ */
+function _get_path_to_translation_from_lang_dir( $domain ) {
+ static $cached_mofiles = null;
+
+ if ( null === $cached_mofiles ) {
+ $cached_mofiles = array();
+
+ $locations = array(
+ WP_LANG_DIR . '/plugins',
+ WP_LANG_DIR . '/themes',
+ );
+
+ foreach ( $locations as $location ) {
+ $mofiles = glob( $location . '/*.mo' );
+ if ( $mofiles ) {
+ $cached_mofiles = array_merge( $cached_mofiles, $mofiles );
+ }
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale = determine_locale();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mofile = "{$domain}-{$locale}.mo";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Themes with their language directory outside of WP_LANG_DIR have a different file name.
- $template_directory = trailingslashit( get_template_directory() );
- $stylesheet_directory = trailingslashit( get_stylesheet_directory() );
- if ( 0 === strpos( $path, $template_directory ) || 0 === strpos( $path, $stylesheet_directory ) ) {
- $mofile = "{$path}{$locale}.mo";
- } else {
- $mofile = "{$path}{$domain}-{$locale}.mo";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = WP_LANG_DIR . '/plugins/' . $mofile;
+ if ( in_array( $path, $cached_mofiles, true ) ) {
+ return $path;
</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 load_textdomain( $domain, $mofile );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = WP_LANG_DIR . '/themes/' . $mofile;
+ if ( in_array( $path, $cached_mofiles, true ) ) {
+ return $path;
+ }
+
+ return false;
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1266,7 +1297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.8.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">- * @global MO[] $l10n An array of all currently loaded text domains.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global MO[] $l10n
</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"> * @return Translations|NOOP_Translations A Translations instance.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1290,7 +1321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.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">- * @global MO[] $l10n An array of all currently loaded text domains.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global MO[] $l10n
</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"> * @return bool Whether there are translations.
</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 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/src/wp-settings.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load the L10n library.
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/l10n.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require_once ABSPATH . WPINC . '/class-wp-textdomain-registry.php';
</del><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-locale.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . WPINC . '/class-wp-locale-switcher.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,17 +301,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wp_embed'] = new WP_Embed();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * WordPress Textdomain Registry object.
- *
- * Used to support just-in-time translations for manually loaded textdomains.
- *
- * @since 5.6.0
- *
- * @global WP_Locale_Switcher $wp_locale_switcher WordPress Textdomain Registry.
- */
-$GLOBALS['wp_textdomain_registry'] = new WP_Textdomain_Registry();
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Load multisite-specific files.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/ms-functions.php';
</span></span></pre></div>
<a id="trunktestsphpunitdatalanguagespluginsinternationalizedpluginde_DEmo"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-de_DE.mo</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunktestsphpunitdatalanguagespluginsinternationalizedpluginde_DEpo"></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/languages/plugins/internationalized-plugin-de_DE.po</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-de_DE.po 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-de_DE.po 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,12 +2,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px"> "Project-Id-Version: \n"
</span><span class="cx" style="display: block; padding: 0 10px"> "POT-Creation-Date: 2015-12-31 16:31+0100\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"PO-Revision-Date: 2020-10-20 17:11+0200\n"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+"PO-Revision-Date: 2016-10-26 00:02+0200\n"
</ins><span class="cx" style="display: block; padding: 0 10px"> "Language: de_DE\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "MIME-Version: 1.0\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Type: text/plain; charset=UTF-8\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Transfer-Encoding: 8bit\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"X-Generator: Poedit 2.4.1\n"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+"X-Generator: Poedit 1.8.10\n"
</ins><span class="cx" style="display: block; padding: 0 10px"> "X-Poedit-Basepath: .\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Plural-Forms: nplurals=2; plural=(n != 1);\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,8 +14,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;"
</span><span class="cx" style="display: block; padding: 0 10px"> "esc_html_x:1,2c\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "X-Textdomain-Support: yes\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"Language-Team: \n"
-"Last-Translator: \n"
</del><span class="cx" style="display: block; padding: 0 10px"> "X-Poedit-SearchPath-0: .\n"
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #: internationalized-plugin.php:11
</span></span></pre></div>
<a id="trunktestsphpunitdatalanguagespluginsinternationalizedplugines_ESmo"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-es_ES.mo</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunktestsphpunitdatalanguagespluginsinternationalizedplugines_ESpo"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-es_ES.po</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-es_ES.po 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/data/languages/plugins/internationalized-plugin-es_ES.po 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,23 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2015-12-31 16:31+0100\n"
-"PO-Revision-Date: 2020-10-20 17:12+0200\n"
-"Language: de_DE\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.4.1\n"
-"X-Poedit-Basepath: .\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;"
-"_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;"
-"esc_html_x:1,2c\n"
-"X-Textdomain-Support: yes\n"
-"Language-Team: \n"
-"Last-Translator: \n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: internationalized-plugin.php:11
-msgid "This is a dummy plugin"
-msgstr "Este es un plugin dummy"
</del></span></pre></div>
<a id="trunktestsphpunitdatalanguagesthemesinternationalizedthemede_DEmo"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/languages/themes/internationalized-theme-de_DE.mo</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunktestsphpunitdatalanguagesthemesinternationalizedthemede_DEpo"></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/languages/themes/internationalized-theme-de_DE.po</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/languages/themes/internationalized-theme-de_DE.po 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/data/languages/themes/internationalized-theme-de_DE.po 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,12 +2,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> msgstr ""
</span><span class="cx" style="display: block; padding: 0 10px"> "Project-Id-Version: \n"
</span><span class="cx" style="display: block; padding: 0 10px"> "POT-Creation-Date: 2015-12-31 16:38+0100\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"PO-Revision-Date: 2020-10-20 17:09+0200\n"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+"PO-Revision-Date: 2016-10-26 00:02+0200\n"
</ins><span class="cx" style="display: block; padding: 0 10px"> "Language: de_DE\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "MIME-Version: 1.0\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Type: text/plain; charset=UTF-8\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Content-Transfer-Encoding: 8bit\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"X-Generator: Poedit 2.4.1\n"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+"X-Generator: Poedit 1.8.10\n"
</ins><span class="cx" style="display: block; padding: 0 10px"> "X-Poedit-Basepath: .\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "Plural-Forms: nplurals=2; plural=(n != 1);\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "X-Poedit-KeywordsList: __;_e;_x:1,2c;_ex:1,2c;_n:1,2;_nx:1,2,4c;_n_noop:1,2;"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,8 +14,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "_nx_noop:1,2,3c;esc_attr__;esc_html__;esc_attr_e;esc_html_e;esc_attr_x:1,2c;"
</span><span class="cx" style="display: block; padding: 0 10px"> "esc_html_x:1,2c\n"
</span><span class="cx" style="display: block; padding: 0 10px"> "X-Textdomain-Support: yes\n"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-"Last-Translator: \n"
-"Language-Team: \n"
</del><span class="cx" style="display: block; padding: 0 10px"> "X-Poedit-SearchPath-0: .\n"
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #: functions.php:7
</span></span></pre></div>
<a id="trunktestsphpunitdatapluginshellophp"></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/hello.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/plugins/hello.php 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/data/plugins/hello.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,8 +4,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Plugin URI: http://wordpress.org/#
</span><span class="cx" style="display: block; padding: 0 10px"> Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
</span><span class="cx" style="display: block; padding: 0 10px"> Author: Matt Mullenweg
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Version: 1.7.2
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Version: 1.5.1
</ins><span class="cx" style="display: block; padding: 0 10px"> Author URI: http://ma.tt/
</span><span class="cx" style="display: block; padding: 0 10px"> Text Domain: hello-dolly
</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">+
+// Test for
+?>
</ins></span></pre></div>
<a id="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/includes/bootstrap.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,11 +37,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once $config_file_path;
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/functions.php';
</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 ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH ) ) {
- echo "Error: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n";
- exit( 1 );
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> $phpunit_version = tests_get_phpunit_version();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( version_compare( $phpunit_version, '5.4', '<' ) || version_compare( $phpunit_version, '8.0', '>=' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,23 +48,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit( 1 );
</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">-$required_extensions = array(
- 'gd',
-);
-$missing_extensions = array();
-
-foreach ( $required_extensions as $extension ) {
- if ( ! extension_loaded( $extension ) ) {
- $missing_extensions[] = $extension;
- }
-}
-
-if ( $missing_extensions ) {
- printf(
- "Error: The following required PHP extensions are missing from the testing environment: %s.\n",
- implode( ', ', $missing_extensions )
- );
- echo "Please make sure they are installed and enabled.\n",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH ) ) {
+ echo "Error: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> exit( 1 );
</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">@@ -79,23 +59,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'WP_TESTS_TITLE',
</span><span class="cx" style="display: block; padding: 0 10px"> 'WP_PHP_BINARY',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$missing_constants = array();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $required_constants as $constant ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( $constant ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $missing_constants[] = $constant;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ "Error: The required %s constant is not defined. Check out `wp-tests-config-sample.php` for an example.\n",
+ $constant
+ );
+ exit( 1 );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $missing_constants ) {
- printf(
- "Error: The following required constants are not defined: %s.\n",
- implode( ', ', $missing_constants )
- );
- echo "Please check out `wp-tests-config-sample.php` for an example.\n",
- exit( 1 );
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> tests_reset__SERVER();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_TESTS_TABLE_PREFIX', $table_prefix );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,12 +76,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'DIR_TESTDATA', __DIR__ . '/../data' );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'DIR_TESTROOT', realpath( dirname( __DIR__ ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define( 'WP_LANG_DIR', realpath( DIR_TESTDATA . '/languages' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+define( 'WP_LANG_DIR', DIR_TESTDATA . '/languages' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
- define( 'WP_PLUGIN_DIR', realpath( DIR_TESTDATA . '/plugins' ) );
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WP_TESTS_FORCE_KNOWN_BUGS' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_TESTS_FORCE_KNOWN_BUGS', false );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,10 +140,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter' );
</span><span class="cx" style="display: block; padding: 0 10px"> // Use the Spy REST Server instead of default.
</span><span class="cx" style="display: block; padding: 0 10px"> tests_add_filter( 'wp_rest_server_class', '_wp_rest_server_class_filter' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Prevent updating translations asynchronously.
-tests_add_filter( 'async_update_translation', '__return_false' );
-// Disable background updates.
-tests_add_filter( 'automatic_updater_disabled', '__return_true' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Preset WordPress options defined in bootstrap file.
</span><span class="cx" style="display: block; padding: 0 10px"> // Used to activate themes, plugins, as well as other settings.
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPluginphp"></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/admin/includesPlugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPlugin.php 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/tests/admin/includesPlugin.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Description' => 'This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page. <cite>By <a href="http://ma.tt/">Matt Mullenweg</a>.</cite>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Author' => '<a href="http://ma.tt/">Matt Mullenweg</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'AuthorURI' => 'http://ma.tt/',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Version' => '1.7.2',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Version' => '1.5.1',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'TextDomain' => 'hello-dolly',
</span><span class="cx" style="display: block; padding: 0 10px"> 'DomainPath' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestsl10nloadTextdomainphp"></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/loadTextdomain.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/loadTextdomain.php 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/tests/l10n/loadTextdomain.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,11 +24,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'plugin_locale', array( $this, 'store_locale' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'theme_locale', array( $this, 'store_locale' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /** @var WP_Textdomain_Registry $wp_textdomain_registry */
- global $wp_textdomain_registry;
-
- $wp_textdomain_registry->reset();
</del><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"> public function tearDown() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,11 +30,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'plugin_locale', array( $this, 'store_locale' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'theme_locale', array( $this, 'store_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">- /** @var WP_Textdomain_Registry $wp_textdomain_registry */
- global $wp_textdomain_registry;
-
- $wp_textdomain_registry->reset();
-
</del><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</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">@@ -126,13 +116,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21319
</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 function test_is_textdomain_is_not_loaded_after_gettext_call_with_no_translations() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_is_textdomain_is_not_loaded_after_gettext_call_with_no_translations() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'just some string', 'wp-tests-domain' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
</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">- public function test_override_load_textdomain_noop() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_override_load_textdomain_noop() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'override_load_textdomain', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px"> $load_textdomain = load_textdomain( 'wp-tests-domain', DIR_TESTDATA . '/non-existent-file' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'override_load_textdomain', '__return_true' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
</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">- public function test_override_load_textdomain_non_existent_mofile() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_override_load_textdomain_non_existent_mofile() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $load_textdomain = load_textdomain( 'wp-tests-domain', WP_LANG_DIR . '/non-existent-file.mo' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $is_textdomain_loaded_after );
</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">- public function test_override_load_textdomain_custom_mofile() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_override_load_textdomain_custom_mofile() {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $load_textdomain = load_textdomain( 'wp-tests-domain', WP_LANG_DIR . '/plugins/internationalized-plugin-de_DE.mo' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'override_load_textdomain', array( $this, '_override_load_textdomain_filter' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $file Path to the MO file.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</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 function _override_load_textdomain_filter( $override, $domain, $file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function _override_load_textdomain_filter( $override, $domain, $file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $l10n;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_readable( $file ) ) {
</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 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,12 +32,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'template_root', array( $this, 'filter_theme_root' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $GLOBALS['wp_themes'], $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
-
- /** @var WP_Textdomain_Registry $wp_textdomain_registry */
- global $wp_textdomain_registry;
-
- $wp_textdomain_registry->reset();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $GLOBALS['wp_themes'] );
+ unset( $GLOBALS['l10n'] );
+ unset( $GLOBALS['l10n_unloaded'] );
+ _get_path_to_translation( null, true );
</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"> public function tearDown() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,13 +44,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'template_root', array( $this, 'filter_theme_root' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $GLOBALS['wp_themes'], $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $GLOBALS['wp_themes'] );
+ unset( $GLOBALS['l10n'] );
+ unset( $GLOBALS['l10n_unloaded'] );
+ _get_path_to_translation( null, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @var WP_Textdomain_Registry $wp_textdomain_registry */
- global $wp_textdomain_registry;
-
- $wp_textdomain_registry->reset();
-
</del><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</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">@@ -174,7 +170,6 @@
</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"> * @ticket 37997
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @ticket 39210
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_plugin_translation_after_switching_locale_twice() {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Das ist ein Dummy Plugin', $expected_de_de );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'Este es un plugin dummy', $expected_es_es );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'This is a dummy plugin', $expected_es_es );
</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="trunktestsphpunittestsl10nlocaleSwitcherphp"></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/localeSwitcher.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/l10n/localeSwitcher.php 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/tests/l10n/localeSwitcher.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,22 +22,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->locale = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->previous_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">- unset( $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
-
- /** @var WP_Textdomain_Registry $wp_textdomain_registry */
- global $wp_textdomain_registry;
-
- $wp_textdomain_registry->reset();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $GLOBALS['l10n'] );
+ unset( $GLOBALS['l10n_unloaded'] );
+ _get_path_to_translation( null, true );
</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"> public function tearDown() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $GLOBALS['l10n'] );
+ unset( $GLOBALS['l10n_unloaded'] );
+ _get_path_to_translation( null, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** @var WP_Textdomain_Registry $wp_textdomain_registry */
- global $wp_textdomain_registry;
-
- $wp_textdomain_registry->reset();
-
</del><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</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">@@ -394,77 +388,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'This is a dummy plugin', $expected );
</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">- /**
- * @ticket 39210
- */
- public function test_switch_reloads_plugin_translations_outside_wp_lang_dir() {
- global $wp_locale_switcher, $wp_textdomain_registry;
-
- $locale_switcher = clone $wp_locale_switcher;
-
- $wp_locale_switcher = new WP_Locale_Switcher();
- $wp_locale_switcher->init();
-
- require_once DIR_TESTDATA . '/plugins/custom-internationalized-plugin/custom-internationalized-plugin.php';
-
- $this->assertSame( WP_PLUGIN_DIR . '/custom-internationalized-plugin/languages/', $wp_textdomain_registry->get( 'custom-internationalized-plugin' ) );
-
- $expected = custom_i18n_plugin_test();
- $this->assertSame( 'This is a dummy plugin', $expected );
-
- switch_to_locale( 'es_ES' );
- switch_to_locale( 'de_DE' );
-
- $expected = custom_i18n_plugin_test();
- $this->assertSame( 'Das ist ein Dummy Plugin', $expected );
-
- restore_previous_locale();
-
- $expected = custom_i18n_plugin_test();
- $this->assertSame( 'Este es un plugin dummy', $expected );
-
- restore_current_locale();
-
- $wp_locale_switcher = $locale_switcher;
- }
-
- /**
- * @ticket 39210
- */
- public function test_switch_reloads_theme_translations_outside_wp_lang_dir() {
- global $wp_locale_switcher, $wp_textdomain_registry;
-
- $locale_switcher = clone $wp_locale_switcher;
-
- $wp_locale_switcher = new WP_Locale_Switcher();
- $wp_locale_switcher->init();
-
- switch_theme( 'custom-internationalized-theme' );
-
- require_once get_stylesheet_directory() . '/functions.php';
-
- $this->assertSame( get_template_directory() . '/languages/', $wp_textdomain_registry->get( 'custom-internationalized-theme' ) );
-
- $expected = custom_i18n_theme_test();
-
- $this->assertSame( 'This is a dummy theme', $expected );
-
- switch_to_locale( 'es_ES' );
- switch_to_locale( 'de_DE' );
-
- $expected = custom_i18n_theme_test();
- $this->assertSame( 'Das ist ein Dummy Theme', $expected );
-
- restore_previous_locale();
-
- $expected = custom_i18n_theme_test();
- $this->assertSame( 'Este es un tema dummy', $expected );
-
- restore_current_locale();
-
- $wp_locale_switcher = $locale_switcher;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function filter_locale() {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'es_ES';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststhemethemeDirphp"></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/theme/themeDir.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/themeDir.php 2020-11-12 14:34:33 UTC (rev 49565)
+++ trunk/tests/phpunit/tests/theme/themeDir.php 2020-11-12 14:41:19 UTC (rev 49566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Page Template Theme', // Theme with page templates for other test code.
</span><span class="cx" style="display: block; padding: 0 10px"> 'Theme with Spaces in the Directory',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Internationalized Theme',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Custom Internationalized Theme',
</del><span class="cx" style="display: block; padding: 0 10px"> 'camelCase',
</span><span class="cx" style="display: block; padding: 0 10px"> 'REST Theme',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>