Merge branch 'release/1.6.0'

Author: VaLeXaR

README.md

@@ -1,4 +1,4 @@
-# WP Multilang
+# [WP Multilang](https://wordpress.org/plugins/wp-multilang/)
 
 Multilingual plugin for WordPress.
 
@@ -39,6 +39,7 @@ Features of the plugin WP Multilang:
 * Max Mega Menu
 * MasterSlider
 * WP-PageNavi
+* BuddyPress
 
 Supports configuration via json.
 

assets/scripts/add-lang-to-customizer.js

@@ -29,7 +29,6 @@ var WPMLang = (function( api, $ ) {
     }
 
     api.bind( 'ready', function(){
-      // console.log( home.url );
       api.previewer.previewUrl.set( home.url );
     });
   };

composer.lock

@@ -0,0 +1,13 @@
+{
+  "post_types": {
+    "bp-email": {}
+  },
+  "options": {
+    "bp_email_options": {
+      "footer_text": {}
+    }
+  },
+  "admin_pages": [
+    "users_page_bp-profile-setup"
+  ]
+}

configs/buddypress.json

@@ -0,0 +1,19 @@
+{
+  "post_types": {
+    "ml-slide": {
+      "post_title": null,
+      "post_content": null
+    },
+    "ml-slider": {
+      "post_content": null,
+      "post_excerpt": null
+    }
+  },
+  "post_fields": {
+    "ml-slider_title": {},
+    "ml-slider_url": {}
+  },
+  "admin_pages": [
+    "toplevel_page_metaslider"
+  ]
+}

configs/ml-slider.json

@@ -0,0 +1,11 @@
+{
+  "post_types": {
+    "tablepress_table": {
+      "post_content": null
+    }
+  },
+  "admin_pages": [
+    "tablepress_list",
+    "tablepress_edit"
+  ]
+}

configs/tablepress.json

@@ -7,6 +7,7 @@
  * @package     WPM/Core/Admin
  * @class       WPM_Admin_Customizer
  * @since       1.4.9
+ * @version     1.0.1
  */
 
 namespace WPM\Core\Admin;
@@ -34,20 +35,8 @@ public function add_lang_to_customizer_previewer() {
 		$suffix    = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 		$src = wpm_asset_path( '/scripts/add-lang-to-customizer' . $suffix . '.js' );
 		wp_enqueue_script( 'wpm-add-lang-to-customizer', $src, array( 'customize-controls' ), WPM_VERSION , true );
-		$url = add_query_arg( 'lang', wpm_get_language(), get_home_url() );
-		$this->add_lang_to_template( $url );
-	}
-
-	/**
-	 * Set the previewer url
-	 *
-	 * @param string $url
-	 */
-	public function add_lang_to_template( $url ) {
-		wp_add_inline_script(
-			'wpm-add-lang-to-customizer',
-			sprintf( 'WPMLang.init( %s );', wp_json_encode( array( 'url' => $url ) ) ),
-			'after'
-		);
+		$base_url = apply_filters( 'wpm_customizer_url', get_home_url() );
+		$url = add_query_arg( 'lang', wpm_get_language(), $base_url );
+		wp_add_inline_script( 'wpm-add-lang-to-customizer', sprintf( 'WPMLang.init( %s );', wp_json_encode( array( 'url' => $url ) ) ) );
 	}
 }

core/admin/class-wpm-admin-customizer.php

@@ -10,7 +10,7 @@
  * Class WPM_Posts
  * @package  WPM\Core
  * @author   VaLeXaR
- * @version  1.1.3
+ * @version  1.1.4
  */
 class WPM_Posts extends \WPM_Object {
 
@@ -89,13 +89,19 @@ public function filter_posts_by_language( $query ) {
 				}
 			}
 
+			/*if ( isset( $query->query_vars['lang'] ) && ! empty( $query->query_vars['lang'] ) ) {
+				$lang = $query->query_vars['lang'];
+			} else {
+				$lang = wpm_get_language();
+			}*/
+
 			$lang = get_query_var( 'lang' );
 
 			if ( ! $lang && ! $query->is_main_query() ) {
 				$lang = wpm_get_user_language();
 			}
 
-			if ( $lang ) {
+			if ( 'all' !== $lang ) {
 				$lang_meta_query = array(
 					array(
 						'relation' => 'OR',

core/class-wpm-posts.php

@@ -448,8 +448,8 @@ public function redirect_to_user_language() {
 				}
 			} else {
 				if ( $_COOKIE['wpm_language'] != $this->user_language ) {
-					do_action( 'wpm_changed_language' );
 					wpm_setcookie( 'wpm_language', $this->user_language, time() + YEAR_IN_SECONDS );
+					do_action( 'wpm_changed_language' );
 				}
 			} // End if().
 		} // End if().

core/class-wpm-setup.php

@@ -89,13 +89,13 @@ public function filter_terms_by_language( $args, $taxonomies ) {
 				}
 			}
 
-			$lang = get_query_var( 'lang' );
-
-			if ( ! $lang ) {
-				$lang = wpm_get_user_language();
+			if ( isset( $args['lang'] ) && ! empty( $args['lang'] ) ) {
+				$lang = $args['lang'];
+			} else {
+				$lang = wpm_get_language();
 			}
 
-			if ( $lang ) {
+			if ( 'all' != $lang ) {
 				$lang_meta_query = array(
 					array(
 						'relation' => 'OR',
@@ -287,10 +287,10 @@ public function update_description( $tt_id, $taxonomy ) {
 			return;
 		}
 
-		$old_value       = $this->description['old'];
-		$strings         = wpm_value_to_ml_array( $old_value );
-		$value           = wpm_set_language_value( $strings, $value, $taxonomies_config[ $taxonomy ] );
-		$description     = wpm_ml_value_to_string( $value );
+		$old_value   = $this->description['old'];
+		$strings     = wpm_value_to_ml_array( $old_value );
+		$value       = wpm_set_language_value( $strings, $value, $taxonomies_config[ $taxonomy ] );
+		$description = wpm_ml_value_to_string( $value );
 
 		$wpdb->update( $wpdb->term_taxonomy, compact( 'description' ), array( 'term_taxonomy_id' => $tt_id ) );
 	}

core/class-wpm-taxonomies.php

@@ -30,7 +30,7 @@ public function __construct() {
 	 * @return bool|array
 	 */
 	public function widget_display( $instance ) {
-		if ( isset( $instance['languages'] ) && is_array( $instance['languages'] ) && ! in_array( wpm_get_user_language(), $instance['languages'] ) ) {
+		if ( isset( $instance['languages'] ) && is_array( $instance['languages'] ) && ! in_array( wpm_get_language(), $instance['languages'] ) ) {
 			return false;
 		}
 

core/class-wpm-widgets.php

@@ -123,7 +123,7 @@ public function update_old_fields( $check, $object_id, $meta_key, $meta_value )
 		if ( isset( $this->meta_fields[ $meta_key ] ) && $this->meta_fields[ $meta_key ] ) {
 
 			$old_value  = wpm_value_to_ml_array( $this->meta_fields[ $meta_key ] );
-			$meta_value = wpm_set_language_value( $old_value, $meta_value, array() );
+			$meta_value = wpm_set_language_value( $old_value, $meta_value );
 			$meta_value = wpm_ml_value_to_string( $meta_value );