vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 21:00:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

I18N: Fix JavaScript translations for subdirectory installations.

Browse Source 
Fixes the `load_script_textdomain` function not resolving the md5 hash based on the relative path for WordPress installations in a subdirectory. Also adds a filter to allow sites using CDNs or other alternative asset locations to filter the relative path resolution.

Props akirk, fierevere, swissspidy, mypacecreator, babaevan, tmatsuur, ocean90, herregroen.

Merges [44209] to trunk.

Fixes #45528.

git-svn-id: https://develop.svn.wordpress.org/trunk@44310 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jonathan Desrosiers
2018-12-18 23:09:51 +00:00
parent 80c1e36885
commit 0f349bd621
2 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/l10n/loadScriptTextdomain.php
+41
View File
@@ -0,0 +1,41 @@
<?php
/**
* @group l10n
* @group i18n
*/
class Tests_L10n_loadScriptTextdomain extends WP_UnitTestCase {
public function site_url_subdirectory( $site_url ) {
return $site_url . '/wp';
}
public function relative_path_from_cdn( $relative, $src ) {
if ( 0 === strpos( $src, 'https://my-cdn.com/wordpress/' ) ) {
return substr( $src, strlen( 'https://my-cdn.com/wordpress/' ) );
}
return $relative;
}
/**
* @ticket 45528
*/
public function test_resolve_relative_path() {
$json_translations = file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' );
wp_enqueue_script( 'test-example-root', '/wp-includes/js/script.js', array(), null );
$this->assertEquals( $json_translations, load_script_textdomain( 'test-example-root', 'default', DIR_TESTDATA . '/languages' ) );
// Assets on a CDN.
add_filter( 'load_script_textdomain_relative_path', array( $this, 'relative_path_from_cdn' ), 10, 2 );
wp_enqueue_script( 'test-example-cdn', 'https://my-cdn.com/wordpress/wp-includes/js/script.js', array(), null );
$this->assertEquals( $json_translations, load_script_textdomain( 'test-example-cdn', 'default', DIR_TESTDATA . '/languages' ) );
remove_filter( 'load_script_textdomain_relative_path', array( $this, 'relative_path_from_cdn' ) );
// Test for WordPress installs in a subdirectory.
add_filter( 'site_url', array( $this, 'site_url_subdirectory' ) );
wp_enqueue_script( 'test-example-subdir', '/wp/wp-includes/js/script.js', array(), null );
$this->assertEquals( $json_translations, load_script_textdomain( 'test-example-subdir', 'default', DIR_TESTDATA . '/languages' ) );
remove_filter( 'site_url', array( $this, 'site_url_subdirectory' ) );
}
}