Changeset 22346

Timestamp:

10/31/2012 09:30:33 PM (14 years ago)

Author:

dd32

Message:

Theme Translations: Allow for theme pomo files to be loaded from WP_LANG_DIR/themes/{$domain}-{$locale}.(p|m)o.
This directory format is what we have chosen for Language Packs (See #18200), but which is currently delayed.

By making this change, we can ship localised theme files within core for bundled themes, and avoid the issues associated with Theme Updates overwriting/removing the language files.

Fixes #18960

File:

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

trunk/wp-includes/l10n.php

@@ -460 +460 @@
         $locale = apply_filters( 'theme_locale', get_locale(), $domain );
 
-        $path = ( empty( $path ) ) ? get_template_directory() : $path;
-
-        $mofile = "$path/$locale.mo";
+        if ( ! $path )
+                $path = get_template_directory();
+
+        // Load the textdomain from the Theme provided location, or theme directory first
+        $mofile = "{$path}/{$locale}.mo";
+        if ( $loaded = load_textdomain($domain, $mofile) )
+                return $loaded;
+
+        // Else, load textdomain from the Language directory
+        $mofile = WP_LANG_DIR . "/themes/{$domain}-{$locale}.mo";
         return load_textdomain($domain, $mofile);
 }
@@ -479 +486 @@
  */
 function load_child_theme_textdomain( $domain, $path = false ) {
-        $locale = apply_filters( 'theme_locale', get_locale(), $domain );
-
-        $path = ( empty( $path ) ) ? get_stylesheet_directory() : $path;
-
-        $mofile = "$path/$locale.mo";
-        return load_textdomain($domain, $mofile);
+        if ( ! $path )
+                $path = get_stylesheet_directory();
+        return load_theme_textdomain( $domain, $path );
 }