Ticket #770: bp-core.patch

bp-core.php

@@ -21 +21 @@
 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. */
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-catchuri.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-classes.php' );
@@ -1526 +1522 @@
         wp_cache_delete( 'newest_users' );
 }
 
+/**
+ * bp_load_buddypress_textdomain()
+ * 
+ * Load the buddypress translation file for current language
+ * 
+ * @package BuddyPress Core
+ */
+function bp_load_buddypress_textdomain() {
+        $locale = get_locale();
+        $locale = apply_filters('buddypress_locale', $locale);
+        $mofile = BP_PLUGIN_DIR . "/bp-languages/buddypress-$locale.mo";
+        load_textdomain( 'buddypress', $mofile );
+}
+add_action ( 'plugins_loaded', 'bp_load_buddypress_textdomain', 9);
+
 // List actions to clear object caches on
 add_action( 'bp_core_delete_avatar', 'bp_core_clear_user_object_cache' );
 add_action( 'bp_core_avatar_save', 'bp_core_clear_user_object_cache' );