Changeset 43898

Timestamp:

11/15/2018 02:36:39 PM (6 years ago)

Author:

herregroen

Message:

I18N: Fix warnings in JavaScript translations.

Fixes an undefined index PHP warning in the load_script_textdomain function and a non-interrupting JS error when registering a domain which has no translations.

Props omarreiss, ocean90, georgestephanis.
Fixes #45256.

Location:

branches/5.0

Files:

• src/wp-includes/class.wp-scripts.php (modified) (1 diff)
• src/wp-includes/l10n.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/scripts.php (modified) (1 diff)

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

@@ -529 +529 @@
 
         if ( ! $json_translations ) {
-            return false;
+            // Register empty locale data object to ensure the domain still exists.
+            $json_translations = '{ "locale_data": { "messages": { "": {} } } }';
         }
 

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

@@ -924 +924 @@
         $relative = array_slice( $relative, 2 );
         $relative = implode( '/', $relative );
-    } else if (
-        ! isset( $site_url['path'] ) &&
-        ( ! isset( $src_url['host'] ) || $src_url['host'] !== $site_url['host'] )
-    ) {
-        $relative = trim( $src_url['path'], '/' );
-    } else if (
-        ( strpos( $src_url['path'], $site_url['path'] ) === 0 ) &&
-        ( ! isset( $src_url['host'] ) || $src_url['host'] !== $site_url['host'] )
-    ) {
-        // Make the src relative to the WP root.
-        $relative = substr( $src, strlen( $site_url['path'] ) );
-        $relative = trim( $relative, '/' );
+    } elseif ( ! isset( $src_url['host'] ) || $src_url['host'] !== $site_url['host'] ) {
+        if ( ! isset( $site_url['path'] ) ) {
+            $relative = trim( $src_url['path'], '/' );
+        } elseif ( ( strpos( $src_url['path'], $site_url['path'] ) === 0 ) ) {
+            // Make the src relative to the WP root.
+            $relative = substr( $src, strlen( $site_url['path'] ) );
+            $relative = trim( $relative, '/' );
+        }
     }
 

branches/5.0/tests/phpunit/tests/dependencies/scripts.php

@@ -864 +864 @@
 
         $expected  = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js'></script>";
-        $expected .= "\n<script type='text/javascript' src='/wp-admin/js/script.js'></script>\n";
+        $expected .= "\n<script type='text/javascript'>\n(function( translations ){" .
+                     "translations.locale_data.messages[\"\"].domain = \"admin\";" .
+                     "wp.i18n.setLocaleData( translations.locale_data.messages, \"admin\" );" .
+                     "})({ \"locale_data\": { \"messages\": { \"\": {} } } });\n</script>\n";
+        $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js'></script>\n";
 
         $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );