Changeset 3392

Timestamp:

11/11/2010 06:34:54 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2243. Back ported from trunk. Props francescolaffi, boonebgorges.

File:

• branches/1.2/bp-core.php (modified) (1 diff)

branches/1.2/bp-core.php

@@ -1964 +1964 @@
  */
 function bp_core_load_buddypress_textdomain() {
-    $locale = apply_filters( 'buddypress_locale', get_locale() );
-    $mofile = BP_PLUGIN_DIR . "/bp-languages/buddypress-$locale.mo";
-
-    if ( file_exists( $mofile ) )
-        load_textdomain( 'buddypress', $mofile );
+    $locale        = apply_filters( 'buddypress_locale', get_locale() );
+    $mofile        = sprintf( 'buddypress-%s.mo', $locale );
+    $mofile_global = WP_LANG_DIR . '/' . $mofile;
+    $mofile_local  = BP_PLUGIN_DIR . '/bp-languages/' . $mofile;
+
+    if ( file_exists( $mofile_global ) )
+        return load_textdomain( 'buddypress', $mofile_global );
+    elseif ( file_exists( $mofile_local ) )
+        return load_textdomain( 'buddypress', $mofile_local );
+    else
+        return false;
 }
 add_action ( 'bp_loaded', 'bp_core_load_buddypress_textdomain', 2 );