Index: src/bp-core/bp-core-functions.php
===================================================================
--- src/bp-core/bp-core-functions.php
+++ src/bp-core/bp-core-functions.php
@@ -1700,17 +1700,10 @@
  * @return bool True on success, false on failure.
  */
 function bp_core_load_buddypress_textdomain() {
-	// Try to load via load_plugin_textdomain() first, for future
-	// wordpress.org translation downloads
-	if ( load_plugin_textdomain( 'buddypress', false, 'buddypress/bp-languages' ) ) {
-		return true;
-	}
-
-	// Nothing found in bp-languages, so try to load from WP_LANG_DIR
-	$locale = apply_filters( 'buddypress_locale', get_locale() );
-	$mofile = WP_LANG_DIR . '/buddypress-' . $locale . '.mo';
-
-	return load_textdomain( 'buddypress', $mofile );
+	// looks for a language file in the following order:
+	//  - /wp-content/plugins/buddypress-YOUR_LOCALE.po
+	//  - /wp-content/languages/plugins/buddypress-YOUR_LOCALE.po
+	load_plugin_textdomain( 'buddypress' );
 }
 add_action ( 'bp_core_loaded', 'bp_core_load_buddypress_textdomain' );