Changeset 44395

Timestamp:

01/04/2019 09:11:01 PM (6 years ago)

Author:

ocean90

Message:

I18N: Make domain argument optional in wp_set_script_translations() / WP_Scripts::set_translations().

Props swissspidy.
Fixes #45489.

Location:

trunk/src/wp-includes

Files:

• class.wp-scripts.php (modified) (2 diffs)
• functions.wp-scripts.php (modified) (1 diff)
• l10n.php (modified) (2 diffs)
• script-loader.php (modified) (2 diffs)

trunk/src/wp-includes/class.wp-scripts.php

@@ -500 +500 @@
      *
      * @since 5.0.0
+     * @since 5.1.0 The `$domain` parameter was made optional.
      *
      * @param string $handle Name of the script to register a translation domain to.
-     * @param string $domain The textdomain.
+     * @param string $domain Optional. Text domain. Default 'default'.
      * @param string $path   Optional. The full file path to the directory containing translation files.
-     *
-     * @return bool True if the textdomain was registered, false if not.
-     */
-    public function set_translations( $handle, $domain, $path = null ) {
+     * @return bool True if the text domain was registered, false if not.
+     */
+    public function set_translations( $handle, $domain = 'default', $path = null ) {
         if ( ! isset( $this->registered[ $handle ] ) ) {
             return false;
@@ -518 +518 @@
             $obj->deps[] = 'wp-i18n';
         }
+
         return $obj->set_translations( $domain, $path );
     }

trunk/src/wp-includes/functions.wp-scripts.php

@@ -210 +210 @@
  *
  * @since 5.0.0
+ * @since 5.1.0 The `$domain` parameter was made optional.
  *
  * @param string $handle Script handle the textdomain will be attached to.
- * @param string $domain The textdomain.
+ * @param string $domain Optional. Text domain. Default 'default'.
  * @param string $path   Optional. The full file path to the directory containing translation files.
- *
- * @return bool True if the textdomain was successfully localized, false otherwise.
- */
-function wp_set_script_translations( $handle, $domain, $path = null ) {
+ * @return bool True if the text domain was successfully localized, false otherwise.
+ */
+function wp_set_script_translations( $handle, $domain = 'default', $path = null ) {
     global $wp_scripts;
     if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {

trunk/src/wp-includes/l10n.php

@@ -899 +899 @@
  * @since 5.0.0
  * @since 5.0.2 Uses load_script_translations() to load translation data.
+ * @since 5.1.0 The `$domain` parameter was made optional.
  *
  * @see WP_Scripts::set_translations()
  *
  * @param string $handle Name of the script to register a translation domain to.
- * @param string $domain The text domain.
+ * @param string $domain Optional. Text domain. Default 'default'.
  * @param string $path   Optional. The full file path to the directory containing translation files.
  *
@@ -909 +910 @@
  *                      in JSON encoding otherwise.
  */
-function load_script_textdomain( $handle, $domain, $path = null ) {
+function load_script_textdomain( $handle, $domain = 'default', $path = null ) {
     $wp_scripts = wp_scripts();
 

trunk/src/wp-includes/script-loader.php

@@ -467 +467 @@
 
     $package_translations = array(
-        'api-fetch'            => 'default',
-        'blocks'               => 'default',
-        'block-library'        => 'default',
-        'components'           => 'default',
-        'edit-post'            => 'default',
-        'editor'               => 'default',
-        'format-library'       => 'default',
-        'keycodes'             => 'default',
-        'list-reusable-blocks' => 'default',
-        'nux'                  => 'default',
+        'api-fetch',
+        'blocks',
+        'block-library',
+        'components',
+        'edit-post',
+        'editor',
+        'format-library',
+        'keycodes',
+        'list-reusable-blocks',
+        'nux',
     );
 
@@ -486 +486 @@
         $scripts->add( $handle, $path, $dependencies, $version, 1 );
 
-        if ( isset( $package_translations[ $package ] ) ) {
-            $scripts->set_translations( $handle, $package_translations[ $package ] );
+        if ( in_array( $package, $package_translations, true ) ) {
+            $scripts->set_translations( $handle );
         }
     }