Ticket #9686: hooks-and-unload_textdomain.2.diff

wp-includes/l10n.php

@@ -69 +69 @@
         return apply_filters( 'gettext', $translations->translate( $text ), $text, $domain );
 }
 
-function before_last_bar( $string ) {
+function before_last_bar( $string ) {   
         $last_bar = strrpos( $string, '|' );
         if ( false == $last_bar )
                 return $string;
@@ -310 +310 @@
                 $mo->merge_with( $l10n[$domain] );
 
         $l10n[$domain] = &$mo;
-
+                
         return true;
 }
 
 /**
+ * Unloads translations for a domain
+ * 
+ * @since 3.0
+ * @param string $domain Textdomain to be unloaded
+ */
+function unload_textdomain( $domain ) {
+        global $l10n;
+
+        $plugin_override = apply_filters( 'override_unload_textdomain', false, $domain );
+
+        if ( true == $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.
  *
  * Loads the .mo file in WP_LANG_DIR constant path from WordPress root. The
@@ -344 +369 @@
  * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR. This is the preferred argument to use. It takes precendence over $abs_rel_path
  */
 function load_plugin_textdomain( $domain, $abs_rel_path = false, $plugin_rel_path = false ) {
-        $locale = get_locale();
+        $locale = apply_filter( 'plugin_locale', get_locale(), $domain );
 
         if ( false !== $plugin_rel_path ) {
                 $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' );
@@ -366 +391 @@
  *
  * @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';
+function load_muplugin_textdomain( $domain ) {
+        $locale = apply_filter( 'plugin_locale', get_locale(), $domain );
 
-        /* @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;
-        */
-
         $mofile = WPMU_PLUGIN_DIR . "/$domain-$locale.mo";
-        load_textdomain($domain, $mofile);
+        load_textdomain( $domain, $mofile );
 }
 
 /**
@@ -393 +410 @@
  *
  * @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_filter( 'theme_locale', get_locale(), $domain );
 
         $path = ( empty( $path ) ) ? get_template_directory() : $path;
 
@@ -414 +431 @@
  *
  * @param string $domain Unique identifier for retrieving translated strings
  */
-function load_child_theme_textdomain($domain, $path = false) {
+function load_child_theme_textdomain( $domain, $path = false ) {
         $locale = get_locale();
 
         $path = ( empty( $path ) ) ? get_stylesheet_directory() : $path;