Changeset 57922

Timestamp:

04/04/2024 01:36:25 PM (10 months ago)

Author:

swissspidy

Message:

I18N: Always search for script translations in wp-content/languages/plugins.

Previously, when WP_PLUGIN_DIR was set to something other than wp-content/plugins, e.g. wp-content/mods, load_script_textdomain was searching for script translations in wp-content/languages/mods. However, that is incorrect, as WP_PLUGIN_DIR does not affect where translations are stored. The location is always wp-content/languages/plugins.

Props coreymckrill, swissspidy.
Fixes #60891.

Location:

trunk

Files:

• src/wp-includes/l10n.php (modified) (1 diff)
• tests/phpunit/tests/l10n/loadScriptTextdomain.php (modified) (2 diffs)

trunk/src/wp-includes/l10n.php

@@ -1190 +1190 @@
         $relative = explode( '/', $relative );
 
-        $languages_path = WP_LANG_DIR . '/' . $relative[0];
+        $languages_path = WP_LANG_DIR . '/plugins';
 
         $relative = array_slice( $relative, 2 ); // Remove plugins/<plugin name> or themes/<theme name>.

trunk/tests/phpunit/tests/l10n/loadScriptTextdomain.php

@@ -14 +14 @@
      * @ticket 46387
      * @ticket 49145
+     * @ticket 60891
      *
      * @dataProvider data_resolve_relative_path
@@ -122 +123 @@
                 ),
             ),
+            // @ticket 60891
+            array(
+                '/languages/plugins/internationalized-plugin-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json',
+                'plugin-in-custom-plugin-dir',
+                '/wp-content/mods/my-plugin/js/script.js',
+                'internationalized-plugin',
+                array(
+                    'plugins_url',
+                    static function () {
+                        return 'https://example.com/wp-content/mods';
+                    },
+                ),
+            ),
         );
     }