Changeset 43859 for branches/5.0/src/wp-includes/class.wp-scripts.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/class.wp-scripts.php (modified) (4 diffs)

branches/5.0/src/wp-includes/class.wp-scripts.php

@@ -326 +326 @@
         }
 
+        $translations = $this->print_translations( $handle, false );
+        if ( $translations ) {
+            $translations = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $translations );
+        }
+
         if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
             $src = $this->base_url . $src;
@@ -339 +344 @@
             return true;
 
-        $tag = "{$cond_before}{$before_handle}<script type='text/javascript' src='$src'></script>\n{$after_handle}{$cond_after}";
+        $tag = "{$translations}{$cond_before}{$before_handle}<script type='text/javascript' src='$src'></script>\n{$after_handle}{$cond_after}";
 
         /**
@@ -479 +484 @@
 
     /**
-     * Register a translation textdomain.
+     * Sets a translation textdomain.
      *
      * @since 5.0.0
@@ -494 +499 @@
         }
 
-        $json_translations = load_script_textdomain( $handle, $domain, $path );
-
-        if ( ! $json_translations ) {
-            return false;
-        }
-
         /** @var \_WP_Dependency $obj */
         $obj = $this->registered[ $handle ];
-        $obj->deps[] = 'wp-i18n';
-
-        return $this->add_inline_script(
-            $handle,
-            '(function( translations ){' .
-                'wp.i18n.setLocaleData( translations.locale_data, "' . $domain . '" );' .
-            '})(' . $json_translations . ');',
-            'before'
-        );
+
+        if ( ! in_array( 'wp-i18n', $obj->deps, true ) ) {
+            $obj->deps[] = 'wp-i18n';
+        }
+        return $obj->set_translations( $domain, $path );
+    }
+
+    /**
+     * Prints translations set for a specific handle.
+     *
+     * @since 5.0.0
+     *
+     * @param string $handle Name of the script to add the inline script to. Must be lowercase.
+     * @param bool   $echo   Optional. Whether to echo the script instead of just returning it.
+     *                       Default true.
+     * @return string|false Script on success, false otherwise.
+     */
+    public function print_translations( $handle, $echo = true ) {
+        if ( ! isset( $this->registered[ $handle ] ) || empty( $this->registered[ $handle ]->textdomain ) ) {
+            return false;
+        }
+
+        $domain = $this->registered[ $handle ]->textdomain;
+        $path   = $this->registered[ $handle ]->translations_path;
+
+        $json_translations = load_script_textdomain( $handle, $domain, $path );
+
+        if ( ! $json_translations ) {
+            return false;
+        }
+
+        $output = '(function( translations ){' .
+                      'wp.i18n.setLocaleData( translations.locale_data, "' . $domain . '" );' .
+                  '})(' . $json_translations . ');';
+
+        if ( $echo ) {
+            printf( "<script type='text/javascript'>\n%s\n</script>\n", $output );
+        }
+
+        return $output;
     }