Changeset 1393 for trunk/bp-core.php

Timestamp:

04/23/2009 09:14:12 AM (17 years ago)

Author:

apeatling

Message:

Reverting the localization changes, the previous fix seems to be causing problems. Will re-address this in 1.1.

File:

• trunk/bp-core.php (modified) (2 diffs)

trunk/bp-core.php

@@ -23 +23 @@
 if ( !defined( 'CUSTOM_USER_META_TABLE' ) )
     define( 'CUSTOM_USER_META_TABLE', $wpdb->base_prefix . 'usermeta' );
+
+/* Load the language file */ 
+if ( file_exists( BP_PLUGIN_DIR . '/bp-languages/buddypress-' . get_locale() . '.mo' ) ) 
+    load_textdomain( 'buddypress', BP_PLUGIN_DIR . '/bp-languages/buddypress-' . get_locale() . '.mo' );
 
 /* Load the files containing functions that we globally will need. */
@@ -241 +245 @@
 }
 add_action( 'admin_menu', 'bp_core_check_installed' );
-
-/**
- * bp_core_load_textdomain()
- *
- * Load a global text domain regardless of blog specific settings.
- * This stops the admin bar translating to the local blog language for a user.
- * 
- * @package BuddyPress Core
- * @uses load_textdomain() Loads the localization file.
- */
-function bp_core_load_textdomain() {
-    if ( defined( 'WPLANG' ) )
-        $locale = WPLANG;
-    else
-        $locale = 'en_US';
-
-    $locale = apply_filters( 'bp_core_buddypress_locale', $locale );
-
-    if ( file_exists( BP_PLUGIN_DIR . '/bp-languages/buddypress-' . $locale . '.mo' ) )
-        load_textdomain( 'buddypress', BP_PLUGIN_DIR . '/bp-languages/buddypress-' . $locale . '.mo' );
-}
-add_action( 'plugins_loaded', 'bp_core_load_textdomain', 1 );
 
 /**