mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-06 21:23:29 +02:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

I18N: Improve _load_textdomain_just_in_time() logic when there are no translation files.

Browse Source 
Fixes a performance issue where the JIT logic is invoked for every translation call if the there are no translations in the current locale. With this change, the information is cached by adding `Noop_Translations` instances to the global `$l10n` array. This way, `get_translations_for_domain()` returns earlier, thus avoiding subsequent `_load_textdomain_just_in_time()` calls.

Props swissspidy, johnbillion, ocean90.
Fixes #58321.

git-svn-id: https://develop.svn.wordpress.org/trunk@55865 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pascal Birchler 2023-05-29 08:34:43 +00:00
parent 7a89d0a265
commit bf38bd326c
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/class-wp-textdomain-registry.php
View File

@ -97,7 +97,7 @@ class WP_Textdomain_Registry {
*/
public function has( $domain ) {
return (
! empty( $this->current[ $domain ] ) ||
isset( $this->current[ $domain ] ) ||
empty( $this->all[ $domain ] ) ||
in_array( $domain, $this->domains_with_translations, true )
);

10
src/wp-includes/l10n.php
View File

@ -834,6 +834,12 @@ function unload_textdomain( $domain, $reloadable = false ) {
do_action( 'unload_textdomain', $domain, $reloadable );
if ( isset( $l10n[ $domain ] ) ) {
if ( $l10n[ $domain ] instanceof NOOP_Translations ) {
unset( $l10n[ $domain ] );
return false;
}
unset( $l10n[ $domain ] );
if ( ! $reloadable ) {
@ -1307,6 +1313,8 @@ function get_translations_for_domain( $domain ) {
$noop_translations = new NOOP_Translations();
}
$l10n[ $domain ] = &$noop_translations;
return $noop_translations;
}
@ -1322,7 +1330,7 @@ function get_translations_for_domain( $domain ) {
*/
function is_textdomain_loaded( $domain ) {
global $l10n;
return isset( $l10n[ $domain ] );
return isset( $l10n[ $domain ] ) && ! $l10n[ $domain ] instanceof NOOP_Translations;
}
/**

21
tests/phpunit/tests/l10n/loadTextdomainJustInTime.php
View File

@ -121,6 +121,27 @@ class Tests_L10n_LoadTextdomainJustInTime extends WP_UnitTestCase {
$this->assertInstanceOf( 'NOOP_Translations', $translations );
}
/**
* @ticket 58321
*
* @covers ::get_translations_for_domain
*/
public function test_get_translations_for_domain_get_locale_is_called_only_once() {
$filter_locale = new MockAction();
add_filter( 'locale', array( $filter_locale, 'filter' ) );
get_translations_for_domain( 'internationalized-plugin' );
get_translations_for_domain( 'internationalized-plugin' );
get_translations_for_domain( 'internationalized-plugin' );
$translations = get_translations_for_domain( 'internationalized-plugin' );
remove_filter( 'locale', array( $filter_locale, 'filter' ) );
$this->assertSame( 1, $filter_locale->get_call_count() );
$this->assertInstanceOf( 'NOOP_Translations', $translations );
$this->assertFalse( is_textdomain_loaded( 'internationalized-plugin' ) );
}
/**
* @ticket 37113
*

2
tests/phpunit/tests/l10n/wpLocaleSwitcher.php
View File

@ -384,7 +384,7 @@ class Tests_L10n_wpLocaleSwitcher extends WP_UnitTestCase {
$locale_switched_user_locale = switch_to_locale( $user_locale ); // False.
$locale_switched_site_locale = switch_to_locale( $site_locale ); // True.
$site_locale_after_switch = get_locale();
$language_header_after_switch = isset( $l10n['default'] ); // en_US
$language_header_after_switch = is_textdomain_loaded( 'default' ); // en_US
restore_current_locale();