Changeset 43859 for branches/5.0/src/wp-includes/l10n.php

Timestamp:

11/01/2018 01:50:59 PM (7 years ago)

Author:

herregroen

Message:

I18N: Improve JavaScript translation support.

Improves upon [43825] by adding unit tests to cover additional use-cases and changes loading translations to only occur when outputting the script to allow setting translations on dependencies.

Props atimmer, omarreiss, nerrad, swissspidy, ocean90.
Fixes #45103.

File:

• branches/5.0/src/wp-includes/l10n.php (modified) (5 diffs)

branches/5.0/src/wp-includes/l10n.php

@@ -877 +877 @@
  * @global WP_Scripts $wp_scripts The WP_Scripts object for printing scripts.
  *
+ * @since 5.0.0
+ *
  * @param string $handle Name of the script to register a translation domain to.
  * @param string $domain The textdomain.
@@ -887 +889 @@
     global $wp_scripts;
 
+    $path   = untrailingslashit( $path );
     $locale = is_admin() ? get_locale() : get_user_locale();
 
     // If a path was given and the handle file exists simply return it.
-    $handle_filename = $domain . '-' . $locale . '-' . $handle . '.json';
+    $file_base       = $domain === 'default' ? $locale : $domain . '-' . $locale;
+    $handle_filename = $file_base . '-' . $handle . '.json';
     if ( $path && file_exists( $path . '/' . $handle_filename ) ) {
         return file_get_contents( $path . '/' . $handle_filename );
@@ -909 +913 @@
     // If the host is the same or it's a relative URL.
     if (
-        strpos( $content_url['path'], $src_url['path'] ) === 0 &&
+        strpos( $src_url['path'], $content_url['path'] ) === 0 &&
         ( ! isset( $src_url['host'] ) || $src_url['host'] !== $content_url['host'] )
     ) {
@@ -926 +930 @@
         $relative = trim( $src_url['path'], '/' );
     } else if (
-        ( strpos( $site_url['path'], $src_url['path'] ) === 0 ) &&
+        ( strpos( $src_url['path'], $site_url['path'] ) === 0 ) &&
         ( ! isset( $src_url['host'] ) || $src_url['host'] !== $site_url['host'] )
     ) {
@@ -944 +948 @@
     }
 
-    $md5_filename = $domain . '-' . $locale . '-' . md5( $relative ) . '.json';
+    $md5_filename = $file_base . '-' . md5( $relative ) . '.json';
     if ( $path && file_exists( $path . '/' . $md5_filename ) ) {
         return file_get_contents( $path . '/' . $md5_filename );