Changeset 37414

Timestamp:

05/10/2016 06:49:21 PM (8 years ago)

Author:

swissspidy

Message:

I18N: Reverse the order of loading plugin and theme translations.

load_theme_textdomain(), load_plugin_textdomain() and load_muplugin_textdomain() now try to load the .mo file from the wp-content/languages directory first. After the introduction of language packs, translation files are more likely to be located there.

Props swissspidy, sebastian.pisula.
Fixes #34213.

File:

• trunk/src/wp-includes/l10n.php (modified) (9 diffs)

trunk/src/wp-includes/l10n.php

@@ -656 +656 @@
  *
  * @since 1.5.0
+ * @since 4.6.0 The function now tries to load the .mo file from the languages directory first.
  *
  * @param string $domain          Unique identifier for retrieving translated strings
@@ -664 +665 @@
  */
 function load_plugin_textdomain( $domain, $deprecated = false, $plugin_rel_path = false ) {
-    $locale = get_locale();
     /**
      * Filter a plugin's locale.
@@ -673 +673 @@
      * @param string $domain Text domain. Unique identifier for retrieving translated strings.
      */
-    $locale = apply_filters( 'plugin_locale', $locale, $domain );
-
-    if ( false !== $plugin_rel_path ) {
+    $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+
+    $mofile = $domain . '-' . $locale . '.mo';
+
+    // Try to load from the languages directory first.
+    if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) {
+        return true;
+    }
+
+    if ( false !== $plugin_rel_path ) {
         $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' );
     } elseif ( false !== $deprecated ) {
@@ -684 +691 @@
     }
 
-    // Load the textdomain according to the plugin first
-    $mofile = $domain . '-' . $locale . '.mo';
-    if ( $loaded = load_textdomain( $domain, $path . '/'. $mofile ) )
-        return $loaded;
-
-    // Otherwise, load from the languages directory
-    $mofile = WP_LANG_DIR . '/plugins/' . $mofile;
-    return load_textdomain( $domain, $mofile );
+    return load_textdomain( $domain, $path . '/' . $mofile );
 }
 
@@ -698 +698 @@
  *
  * @since 3.0.0
+ * @since 4.6.0 The function now tries to load the .mo file from the languages directory first.
  *
  * @param string $domain             Text domain. Unique identifier for retrieving translated strings.
@@ -707 +708 @@
     /** This filter is documented in wp-includes/l10n.php */
     $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
+
+    $mofile = $domain . '-' . $locale . '.mo';
+
+    // Try to load from the languages directory first.
+    if ( load_textdomain( $domain, WP_LANG_DIR . '/plugins/' . $mofile ) ) {
+        return true;
+    }
+
     $path = trailingslashit( WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' ) );
 
-    // Load the textdomain according to the plugin first
-    $mofile = $domain . '-' . $locale . '.mo';
-    if ( $loaded = load_textdomain( $domain, $path . $mofile ) )
-        return $loaded;
-
-    // Otherwise, load from the languages directory
-    $mofile = WP_LANG_DIR . '/plugins/' . $mofile;
-    return load_textdomain( $domain, $mofile );
+    return load_textdomain( $domain, $path . '/' . $mofile );
 }
 
@@ -728 +730 @@
  *
  * @since 1.5.0
+ * @since 4.6.0 The function now tries to load the .mo file from the languages directory first.
  *
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
@@ -735 +738 @@
  */
 function load_theme_textdomain( $domain, $path = false ) {
-    $locale = get_locale();
     /**
      * Filter a theme's locale.
@@ -744 +746 @@
      * @param string $domain Text domain. Unique identifier for retrieving translated strings.
      */
-    $locale = apply_filters( 'theme_locale', $locale, $domain );
-
-    if ( ! $path )
+    $locale = apply_filters( 'theme_locale', get_locale(), $domain );
+
+    $mofile = $domain . '-' . $locale . '.mo';
+
+    // Try to load from the languages directory first.
+    if ( load_textdomain( $domain, WP_LANG_DIR . '/themes/' . $mofile ) ) {
+        return true;
+    }
+
+    if ( ! $path ) {
         $path = get_template_directory();
-
-    // Load the textdomain according to the theme
-    $mofile = untrailingslashit( $path ) . "/{$locale}.mo";
-    if ( $loaded = load_textdomain( $domain, $mofile ) )
-        return $loaded;
-
-    // Otherwise, load from the languages directory
-    $mofile = WP_LANG_DIR . "/themes/{$domain}-{$locale}.mo";
-    return load_textdomain( $domain, $mofile );
+    }
+
+    return load_textdomain( $domain, $path . '/' . $locale . '.mo' );
 }