WordPress.org

Make WordPress Core


Ignore:
Timestamp:
10/20/2020 04:03:58 PM (9 months ago)
Author:
ocean90
Message:

I18N: Introduce WP_Textdomain_Registry to store text domains and their language directory paths.

Previously, when using switch_to_locale() all current loaded text domains were unloaded and added to the $l10n_unloaded global. This prevented the just-in-time loading for text domains after a switch. The just-in-time loading was also only possible if the translations were stored in WP_LANG_DIR. Both issues have been fixed.

  • Adds WP_Textdomain_Registry to keep track of the language directory paths for all plugins and themes.
  • Updates all load_*_textdomain() functions to store the path in WP_Textdomain_Registry.
  • Adds $reloadable parameter to unload_textdomain() to define whether a text domain can be loaded just-in-time again. This is used by WP_Locale_Switcher::load_translations().
  • Extends _load_textdomain_just_in_time() to also support text domains of plugins and themes with custom language directories.
  • Fixes the incorrect test_plugin_translation_after_switching_locale_twice() test which should have catch this issue earlier.
  • Adds a new test plugin/theme to test the loading of translations with a custom language directory.
  • Deprecates the now unused and private _get_path_to_translation() and _get_path_to_translation_from_lang_dir() functions.

Props yoavf, swissspidy, dd32, ocean90.
See #26511.
Fixes #39210.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php

    r47200 r49236  
    3333        add_filter( 'template_root', array( $this, 'filter_theme_root' ) );
    3434        wp_clean_themes_cache();
    35         unset( $GLOBALS['wp_themes'] );
    36         unset( $GLOBALS['l10n'] );
    37         unset( $GLOBALS['l10n_unloaded'] );
    38         _get_path_to_translation( null, true );
     35        unset( $GLOBALS['wp_themes'], $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
     36
     37        /** @var WP_Textdomain_Registry $wp_textdomain_registry */
     38        global $wp_textdomain_registry;
     39
     40        $wp_textdomain_registry->reset();
    3941    }
    4042
     
    4547        remove_filter( 'template_root', array( $this, 'filter_theme_root' ) );
    4648        wp_clean_themes_cache();
    47         unset( $GLOBALS['wp_themes'] );
    48         unset( $GLOBALS['l10n'] );
    49         unset( $GLOBALS['l10n_unloaded'] );
    50         _get_path_to_translation( null, true );
     49        unset( $GLOBALS['wp_themes'], $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
     50
     51        /** @var WP_Textdomain_Registry $wp_textdomain_registry */
     52        global $wp_textdomain_registry;
     53
     54        $wp_textdomain_registry->reset();
    5155
    5256        parent::tearDown();
     
    171175    /**
    172176     * @ticket 37997
     177     * @ticket 39210
    173178     */
    174179    public function test_plugin_translation_after_switching_locale_twice() {
     
    184189
    185190        $this->assertSame( 'Das ist ein Dummy Plugin', $expected_de_de );
    186         $this->assertSame( 'This is a dummy plugin', $expected_es_es );
     191        $this->assertSame( 'Este es un plugin dummy', $expected_es_es );
    187192    }
    188193
Note: See TracChangeset for help on using the changeset viewer.