Merge branch 'release/2.2.1'

Author: VaLeXaR

includes/class-wp-multilang.php

@@ -21,7 +21,7 @@ final class WP_Multilang {
 	 *
 	 * @var string
 	 */
-	public $version = '2.2.0';
+	public $version = '2.2.1';
 
 	/**
 	 * The single instance of the class.

includes/integrations/class-wpm-acf.php

@@ -30,9 +30,6 @@ public function __construct() {
 		add_filter( 'wpm_acf_text_config', '__return_empty_array' );
 		add_filter( 'wpm_acf_textarea_config', '__return_empty_array' );
 		add_filter( 'wpm_acf_wysiwyg_config', '__return_empty_array' );
-		add_action( 'admin_init', array( $this, 'admin_init' ) );
-		remove_class_filter( 'wp_edit_nav_menu_walker', 'acf_form_nav_menu', 'wp_edit_nav_menu_walker' );
-		add_filter( 'wp_edit_nav_menu_walker', array($this, 'wp_edit_nav_menu_walker'), 10, 2 );
 	}
 
 	/**
@@ -45,6 +42,9 @@ public function init_filters() {
 			add_filter( 'acf/get_field_label', 'wpm_translate_string', 6 );
 			add_filter( 'acf/update_field', array( $this, 'update_field_pro' ), 99 );
 			add_filter( 'acf/update_value', array( $this, 'update_value_pro' ), 99, 3 );
+			add_action( 'admin_init', array( $this, 'admin_init' ) );
+			remove_class_filter( 'wp_edit_nav_menu_walker', 'acf_form_nav_menu', 'wp_edit_nav_menu_walker' );
+			add_filter( 'wp_edit_nav_menu_walker', array( $this, 'wp_edit_nav_menu_walker' ), 10, 2 );
 		} else {
 			add_filter( 'wpm_post_acf_config', array( $this, 'add_config' ) );
 			add_filter( 'acf/field_group/get_fields', 'wpm_translate_value', 6 );

includes/wpm-translation-functions.php

@@ -85,7 +85,7 @@ function wpm_translate_url( $url, $language = '' ) {
  */
 function wpm_translate_string( $string, $language = '' ) {
 
-	if ( ! is_string( $string ) || is_serialized_string( $string ) || json_decode( $string ) ) {
+	if ( ! wpm_is_ml_string( $string ) ) {
 		return $string;
 	}
 
@@ -509,13 +509,7 @@ function wpm_is_ml_string( $string ) {
 		return false;
 	}
 
-	$blocks = preg_split( '#(<!--:[a-z-]+-->|<!--:-->|\[:[a-z-]+\]|\[:\]|\{:[a-z-]+\}|\{:\})#ism', $string, - 1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
-
-	if ( is_array( $blocks ) && ! empty( $blocks ) && count( $blocks ) > 1 ) {
-		return true;
-	}
-
-	return false;
+	return preg_match( '#^(<!--:[a-z-]+-->|\[:[a-z-]+\]|\{:[a-z-]+\}).+#ism', $string );
 }
 
 /**

readme.txt

@@ -4,7 +4,7 @@ Contributors: valexar
 Tags: localization, multilanguage, multilingual, translation, multilang
 Requires at least: 4.7
 Tested up to: 4.9
-Stable tag: 2.2.0
+Stable tag: 2.2.1
 Requires PHP: 5.6+
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -170,6 +170,10 @@ Not compatible with:
 
 Function 'get_page_by_title' not working, because in title field are stored titles for all languages. Use function 'wpm_get_page_by_title( $title )' as solution.
 
+NOTE: Because plugins have different ways of storing data, WP Multilang is not compatible with every single plugin out-of-the-box (mostly page builders). This may result in texts not being translatable or translations not being saved. Most of these issues can be resolved using the integration options (wpm-config.json or filters) of WP Multilang.
+
+Please try WP Multilang in a test-environment before activating it on an existing production site and always make a backup before activating!
+
 == Installation ==
 
 1. Upload the plugin files to the `/wp-content/plugins/wp-multilang` directory, or install the plugin through the WordPress plugins screen directly.
@@ -196,6 +200,10 @@ If you have opened several browser tabs for editing this post in different langu
 
 == Changelog ==
 
+= 2.2.1 =
+- fixed escaping text. Have error on some sites.
+- fixed ACF PRO menu integration. Have error on ACFv4.
+
 = 2.2.0 =
 - added alternate locale for opengraph in YOAST SEO
 - added setting default translation

wp-multilang.php

@@ -9,7 +9,7 @@
  * License URI:       https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain:       wp-multilang
  * Domain Path:       /languages
- * Version:           2.2.0
+ * Version:           2.2.1
  * Copyright:         © 2017-2018 Valentyn Riaboshtan
  *
  * @package  WPM