Changeset 13330 for trunk/wp-includes/l10n.php

Timestamp:

02/23/2010 11:14:35 AM (16 years ago)

Author:

nacin

Message:

Introduce unload_textdomain() and add plugin_locale and theme_locale filters to load_*_textdomain() functions. Fixes #9686 props nbachiyski

File:

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

trunk/wp-includes/l10n.php

@@ -316 +316 @@
 
 /**
+ * Unloads translations for a domain
+ * 
+ * @since 3.0.0
+ * @param string $domain Textdomain to be unloaded
+ * @return bool Whether textdomain was unloaded
+ */
+function unload_textdomain( $domain ) {
+        global $l10n;
+
+        $plugin_override = apply_filters( 'override_unload_textdomain', false, $domain );
+
+        if ( $plugin_override )
+                return true;
+
+        do_action( 'unload_textdomain', $domain );
+
+        if ( isset( $l10n[$domain] ) ) {
+                unset( $l10n[$domain] );
+                return true;
+        }
+
+        return false;
+}
+
+/**
  * Loads default translated strings based on locale.
  *
@@ -345 +370 @@
  */
 function load_plugin_textdomain( $domain, $abs_rel_path = false, $plugin_rel_path = false ) {
-        $locale = get_locale();
+        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
 
         if ( false !== $plugin_rel_path ) {
@@ -367 +392 @@
  * @param string $domain Unique identifier for retrieving translated strings
  */
-function load_muplugin_textdomain($domain, $path = false) {
-        $locale = get_locale();
-        if ( empty($locale) )
-                $locale = 'en_US';
-
-        /* @todo $path is not used.  Was it ever used and was it expected to be an arbitrary absolute dir?
-         * Ideally, it should be relative to WPMU_PLUGIN_DUR.
-        if ( false === $path )
-                $path = WPMU_PLUGIN_DIR;
-        */
+function load_muplugin_textdomain( $domain, $path = false ) {
+        $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
 
         $mofile = WPMU_PLUGIN_DIR . "/$domain-$locale.mo";
-        load_textdomain($domain, $mofile);
+        load_textdomain( $domain, $mofile );
 }
 
@@ -394 +411 @@
  * @param string $domain Unique identifier for retrieving translated strings
  */
-function load_theme_textdomain($domain, $path = false) {
-        $locale = get_locale();
+function load_theme_textdomain( $domain, $path = false ) {
+        $locale = apply_filters( 'theme_locale', get_locale(), $domain );
 
         $path = ( empty( $path ) ) ? get_template_directory() : $path;
@@ -415 +432 @@
  * @param string $domain Unique identifier for retrieving translated strings
  */
-function load_child_theme_textdomain($domain, $path = false) {
-        $locale = get_locale();
-
-        $path = ( empty( $path ) ) ? get_stylesheet_directory() : $path;
-
-        $mofile = "$path/$locale.mo";
-        return load_textdomain($domain, $mofile);
+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);
 }