Skip to content
Permalink
Browse files

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.

git-svn-id: https://develop.svn.wordpress.org/branches/5.0@44419 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information...
ocean90 committed Jan 7, 2019
1 parent 583df78 commit 86acc5f728bbd7b5be30461cb8f7e37ef63535c0
Showing with 19 additions and 6 deletions.
  1. +19 −6 src/wp-includes/l10n.php
@@ -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 );

0 comments on commit 86acc5f

Please sign in to comment.
You can’t perform that action at this time.