Changeset 7204

Timestamp:

06/12/2013 09:49:54 PM (11 years ago)

Author:

boonebgorges

Message:

Attempt to use load_plugin_textdomain() before loading translations from WP_LANG_DIR

This will ensure compatibility with future support for automatic translation
downloads on wordpress.org/extend, while continuing to allow translations to be
stored in wp-content/languages/.

Fixes #5030

File:

• trunk/bp-core/bp-core-functions.php (modified) (1 diff)

trunk/bp-core/bp-core-functions.php

@@ -1317 +1317 @@
  */
 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;
+    // 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 );
 }
 add_action ( 'bp_core_loaded', 'bp_core_load_buddypress_textdomain' );