Changeset 25059

Timestamp:

08/20/2013 12:33:07 PM (12 years ago)

Author:

nacin

Message:

Allow for plugin translations to be loaded from WP_LANG_DIR/plugins/$domain-$locale.mo.

props dimadin.
see #18200.

File:

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

trunk/src/wp-includes/l10n.php

@@ -448 +448 @@
     }
 
-    $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
+    // 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 );
 }
@@ -463 +469 @@
 function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
     $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
-    $path = WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' );
-    load_textdomain( $domain, trailingslashit( $path ) . "$domain-$locale.mo" );
+    $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 );
 }
 
@@ -485 +499 @@
         $path = get_template_directory();
 
-    // Load the textdomain from the Theme provided location, or theme directory first
+    // Load the textdomain according to the theme 
     $mofile = "{$path}/{$locale}.mo";
-    if ( $loaded = load_textdomain($domain, $mofile) )
+    if ( $loaded = load_textdomain( $domain, $mofile ) )
         return $loaded;
 
-    // Else, load textdomain from the Language directory
+    // Otherwise, load from the languages directory
     $mofile = WP_LANG_DIR . "/themes/{$domain}-{$locale}.mo";
-    return load_textdomain($domain, $mofile);
+    return load_textdomain( $domain, $mofile );
 }