Changeset 18690

Timestamp:

09/16/2011 11:12:37 AM (14 years ago)

Author:

westi

Message:

Remove the unimplemented user locale code in the admin bar until we actually implement it for real.

Location:

trunk/wp-includes

Files:

• admin-bar.php (modified) (2 diffs)
• class-wp-admin-bar.php (modified) (3 diffs)

trunk/wp-includes/admin-bar.php

@@ -56 +56 @@
         return false;
 
-    $wp_admin_bar->load_user_locale_translations();
-
     do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
 
@@ -65 +63 @@
 
     do_action( 'wp_after_admin_bar_render' );
-
-    $wp_admin_bar->unload_user_locale_translations();
 }
 add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );

trunk/wp-includes/class-wp-admin-bar.php

@@ -1 +1 @@
 <?php
 class WP_Admin_Bar {
-    var $changed_locale = false;
     var $menu;
-    var $need_to_change_locale = false;
     var $proto = 'http://';
     var $user;
@@ -27 +25 @@
                 $this->user->account_domain = $this->user->domain;
             }
-            $this->user->locale = get_locale();
         }
 
@@ -209 +206 @@
         return false;
     }
-
-    // TODO: Convert to a core feature for multisite or remove
-    function load_user_locale_translations() {
-        $this->need_to_change_locale = ( get_locale() != $this->user->locale );
-        if ( ! $this->need_to_change_locale )
-            return;
-        /*
-        $this->previous_translations = get_translations_for_domain( 'default' );
-        $this->adminbar_locale_filter = lambda( '$_', '$GLOBALS["wp_admin_bar"]->user->locale;' );
-        unload_textdomain( 'default' );
-        add_filter( 'locale', $this->adminbar_locale_filter );
-        load_default_textdomain();
-        $this->changed_locale = true;
-        */
-    }
-
-    function unload_user_locale_translations() {
-        global $l10n;
-        if ( ! $this->changed_locale )
-            return;
-        /*
-        remove_filter( 'locale', $this->adminbar_locale_filter );
-        $l10n['default'] = &$this->previous_translations;
-        */
-    }
 }
 ?>