Changeset 6507

Timestamp:

06/09/2017 02:46:51 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Languages: Deprecate custom bbPress /languages/bbpress/ directory.

• It's still supported if it exists, otherwise it's skipped.
• Introduce new base property to the bbPress class to help with targeting the global directory.

This results in 1 fewer call to load_textdomain() and 2 fewer if the old directory is not in place.

File:

• trunk/src/bbpress.php (modified) (3 diffs)

trunk/src/bbpress.php

@@ -213 +213 @@
         $this->file       = __FILE__;
         $this->basename   = apply_filters( 'bbp_plugin_basename', str_replace( array( 'build/', 'src/' ), '', plugin_basename( $this->file ) ) );
+        $this->base_dir   = apply_filters( 'bbp_plugin_base_dir', trailingslashit( dirname( $this->basename ) ) );
 
         // Path and URL
@@ -223 +224 @@
 
         // Languages
+        $this->lang_base    = apply_filters( 'bbp_lang_base',    trailingslashit( $this->base_dir   . 'languages' ) );
         $this->lang_dir     = apply_filters( 'bbp_lang_dir',     trailingslashit( $this->plugin_dir . 'languages' ) );
 
@@ -486 +488 @@
     public function load_textdomain() {
 
-        // Traditional WordPress plugin locale filter
-        $locale        = apply_filters( 'plugin_locale', get_locale(), $this->domain );
-        $mofile        = sprintf( '%1$s-%2$s.mo', $this->domain, $locale );
-
-        // Setup paths to current locale file
-        $mofile_local  = $this->lang_dir . $mofile;
-        $mofile_global = WP_LANG_DIR . '/bbpress/' . $mofile;
-
-        // Look in global /wp-content/languages/bbpress folder
-        load_textdomain( $this->domain, $mofile_global );
-
-        // Look in local /wp-content/plugins/bbpress/languages/ folder
-        load_textdomain( $this->domain, $mofile_local );
+        // Define the old directory
+        $old_dir = WP_LANG_DIR . '/bbpress/';
+
+        // Old location, deprecated in 2.6.0
+        if ( is_dir( $old_dir ) ) {
+
+            // Get locale & file-name
+            $type   = is_admin() ? get_user_locale() : get_locale();
+            $locale = apply_filters( 'plugin_locale', $type, $this->domain );
+            $mofile = sprintf( '%1$s-%2$s.mo', $this->domain, $locale );
+
+            // Look in global /wp-content/languages/bbpress/ folder
+            load_textdomain( $this->domain, $old_dir . $mofile );
+        }
 
         // Look in global /wp-content/languages/plugins/
-        load_plugin_textdomain( $this->domain );
+        load_plugin_textdomain( $this->domain, false, $this->lang_base );
     }