Ticket #4857: 4857.05.patch

bp-core/bp-core-functions.php

@@ -1267 +1267 @@
  * @package BuddyPress Core
  */
 function bp_core_load_buddypress_textdomain() {
-        $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;
+        $locale = apply_filters( 'buddypress_locale', get_locale() );
+
+        // BuddyPress language packs are stored in wp-content/languages
+        $plugin_rel_path = '../languages';
+
+        // Legacy support for .mo files stored in bp-languages
+        $legacy_mofile = BP_PLUGIN_DIR . 'bp-languages/' . sprintf( 'buddypress-%s.mo', $locale );
+        if ( file_exists( $legacy_mofile ) ) {
+                $plugin_rel_path = 'buddypress/bp-languages';
+        }
+
+        return load_plugin_textdomain( 'buddypress', false, $plugin_rel_path );
 }
-add_action ( 'bp_core_loaded', 'bp_core_load_buddypress_textdomain' );
+add_action( 'bp_core_loaded', 'bp_core_load_buddypress_textdomain' );
 
 /**
  * A javascript free implementation of the search functions in BuddyPress