WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

I18N: Expose JSON translation file paths in `load_script_textdomain()`. 

Removes `file_exist()` checks before calling `load_script_translations()` to let the determined paths be passed to `load_script_translations()` which provides its own file check and the possibility to filter the path.

Merge of [44418] to the 5.0 branch.

Props swissspidy, johnbillion, ocean90.
Fixes #45769.
Built from https://develop.svn.wordpress.org/branches/5.0@44419


git-svn-id: http://core.svn.wordpress.org/branches/5.0@44249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2019-01-07 14:42:46 +00:00
parent 8b0f279239
commit 0f3c9c54a0
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wp-includes/l10n.php
View File

@ -897,8 +897,13 @@ function load_script_textdomain( $handle, $domain, $path = null ) {
// If a path was given and the handle file exists simply return it.
$file_base = $domain === 'default' ? $locale : $domain . '-' . $locale;
$handle_filename = $file_base . '-' . $handle . '.json';
if ( $path && file_exists( $path . '/' . $handle_filename ) ) {
return load_script_translations( $path . '/' . $handle_filename, $handle, $domain );
if ( $path ) {
$translations = load_script_translations( $path . '/' . $handle_filename, $handle, $domain );
if ( $translations ) {
return $translations;
}
}
$src = $wp_scripts->registered[ $handle ]->src;
@ -958,11 +963,19 @@ function load_script_textdomain( $handle, $domain, $path = null ) {
}
$md5_filename = $file_base . '-' . md5( $relative ) . '.json';
if ( $path && file_exists( $path . '/' . $md5_filename ) ) {
return load_script_translations( $path . '/' . $md5_filename, $handle, $domain );
if ( $path ) {
$translations = load_script_translations( $path . '/' . $md5_filename, $handle, $domain );
if ( $translations ) {
return $translations;
}
}
if ( file_exists( $languages_path . '/' . $md5_filename ) ) {
return load_script_translations( $languages_path . '/' . $md5_filename, $handle, $domain );
$translations = load_script_translations( $languages_path . '/' . $md5_filename, $handle, $domain );
if ( $translations ) {
return $translations;
}
return load_script_translations( false, $handle, $domain );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.0.3-alpha-44409';
$wp_version = '5.0.3-alpha-44419';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.