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. Props swissspidy, johnbillion, ocean90. See #45769. Built from https://develop.svn.wordpress.org/trunk@44418 git-svn-id: http://core.svn.wordpress.org/trunk@44248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9ac8b5b4f5
commit
86e5a051db
|
@ -922,8 +922,13 @@ function load_script_textdomain( $handle, $domain = 'default', $path = null ) {
|
||||||
// If a path was given and the handle file exists simply return it.
|
// If a path was given and the handle file exists simply return it.
|
||||||
$file_base = $domain === 'default' ? $locale : $domain . '-' . $locale;
|
$file_base = $domain === 'default' ? $locale : $domain . '-' . $locale;
|
||||||
$handle_filename = $file_base . '-' . $handle . '.json';
|
$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;
|
$src = $wp_scripts->registered[ $handle ]->src;
|
||||||
|
@ -983,11 +988,19 @@ function load_script_textdomain( $handle, $domain = 'default', $path = null ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$md5_filename = $file_base . '-' . md5( $relative ) . '.json';
|
$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 );
|
return load_script_translations( false, $handle, $domain );
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '5.1-alpha-44417';
|
$wp_version = '5.1-alpha-44418';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
Loading…
Reference in New Issue