Changeset 9247

Timestamp:

12/21/2014 11:23:43 AM (12 years ago)

Author:

imath

Message:

Make sure custom language files (if they exist) are taking precedence over GlotPress language packs

There can be cases where a community needs cutom language files. In order to make sure these custom language files are loaded, BuddyPress will first check 2 locations before loading the GlotPress language packs :

• WP_LANG_DIR . '/buddypress'
• WP_LANG_DIR

Using the WP_LANG_DIR . '/buddypress' location for the custom language files avoids the mo file name to be listed into the site's language setting of the WordPress general options.

We are also introducing a new filter 'buddypress_locale_locations' so that it's possible to add a custom location to the ones listed above.

Props r-a-y, boonebgorges,danbp,DJPaul

Fixes #5887

File:

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

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

@@ -1747 +1747 @@
  */
 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 );
+        $domain = 'buddypress';
+        $mofile_custom = sprintf( '%s-%s.mo', $domain, apply_filters( 'buddypress_locale', get_locale() ) );
+
+        $locations = apply_filters( 'buddypress_locale_locations', array(
+                trailingslashit( WP_LANG_DIR . '/' . $domain  ),
+                trailingslashit( WP_LANG_DIR ),
+        ) );
+
+        // Try custom locations in WP_LANG_DIR
+        foreach ( $locations as $location ) {
+                if ( load_textdomain( 'buddypress', $location . $mofile_custom ) ) {
+                        return true;
+                }
+        }
+
+        // default to WP and glotpress
+        return load_plugin_textdomain( $domain );
 }
 add_action ( 'bp_core_loaded', 'bp_core_load_buddypress_textdomain' );