fix save translation for enable languages without deleting translations for disable languages

Author: VaLeXaR

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

@@ -5,6 +5,7 @@
  * @author   VaLeXaR
  * @category Admin
  * @package  WPM/Core/Admin
+ * @version  1.0.2
  */
 
 namespace WPM\Core\Admin;
@@ -193,7 +194,7 @@ public function render_language_column( $column ) {
 			$text      = $post->post_title . $post->post_content;
 			$strings   = wpm_value_to_ml_array( $text );
 			$options   = wpm_get_options();
-			$languages = wpm_get_languages();
+			$languages = wpm_get_all_languages();
 
 			foreach ( $languages as $locale => $language ) {
 				if ( isset( $strings[ $language ] ) && ! empty( $strings[ $language ] ) ) {

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

@@ -5,6 +5,7 @@
  * @author   VaLeXaR
  * @category Admin
  * @package  WPM/Core/Admin
+ * @version  1.0.2
  */
 
 namespace WPM\Core\Admin;
@@ -207,7 +208,7 @@ public function render_language_column( $columns, $column, $term_id ) {
 			$text      = $term->name . $term->description;
 			$strings   = wpm_value_to_ml_array( $text );
 			$options   = wpm_get_options();
-			$languages = wpm_get_languages();
+			$languages = wpm_get_all_languages();
 
 			foreach ( $languages as $locale => $language ) {
 				if ( isset( $strings[ $language ] ) && ! empty( $strings[ $language ] ) ) {

core/wpm-language-functions.php

@@ -7,6 +7,7 @@
  * @author        VaLeXaR
  * @category      Core
  * @package       WPM/Functions
+ * @version       1.0.2
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -26,6 +27,24 @@ function wpm_get_languages() {
 	return WPM_Setup::instance()->get_languages();
 }
 
+/**
+ * Get enabled languages
+ *
+ * @see WPM_Setup::get_languages()
+ *
+ * @return array
+ */
+function wpm_get_all_languages() {
+	$options   = wpm_get_options();
+	$languages = array();
+
+	foreach ( $options as $locale => $language ) {
+		$languages[ $locale ] = $language['slug'];
+	}
+
+	return $languages;
+}
+
 /**
  * Get user language
  *
@@ -99,7 +118,8 @@ function wpm_get_translations() {
  */
 function wpm_get_language() {
 	if ( is_admin() ) {
-		$lang = isset( $_GET['edit_lang'] ) ? wpm_clean( $_GET['edit_lang'] ) : ( isset( $_COOKIE['edit_language'] ) ? wpm_clean( $_COOKIE['edit_language'] ) : wpm_get_user_language() );
+		$languages = wpm_get_languages();
+		$lang      = ( isset( $_GET['edit_lang'] ) && in_array( wpm_clean( $_GET['edit_lang'] ), $languages ) ) ? wpm_clean( $_GET['edit_lang'] ) : ( ( isset( $_COOKIE['edit_language'] ) && in_array( wpm_clean( $_COOKIE['edit_language'] ), $languages ) ) ? wpm_clean( $_COOKIE['edit_language'] ) : wpm_get_user_language() );
 	} else {
 		$lang = wpm_get_user_language();
 	}

core/wpm-translation-functions.php

@@ -7,6 +7,7 @@
  * @author        VaLeXaR
  * @category      Core
  * @package       WPM/Functions
+ * @version       1.0.2
  */
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
@@ -166,7 +167,7 @@ function wpm_string_to_ml_array( $string ) {
 
 	$result = array();
 
-	$languages = wpm_get_languages();
+	$languages = wpm_get_all_languages();
 
 	foreach ( $languages as $language ) {
 		$result[ $language ] = '';
@@ -248,7 +249,7 @@ function wpm_ml_array_to_string( $strings ) {
 		return $string;
 	}
 
-	$languages = wpm_get_languages();
+	$languages = wpm_get_all_languages();
 	foreach ( $strings as $key => $value ) {
 		if ( in_array( $key, $languages ) && ! empty( $value ) ) {
 			if ( wpm_is_ml_string( $value ) ) {
@@ -418,7 +419,7 @@ function wpm_is_ml_array( $array ) {
 		return false;
 	}
 
-	$languages = wpm_get_languages();
+	$languages = wpm_get_all_languages();
 
 	foreach ( $array as $key => $item ) {
 		if ( ! is_string( $key ) || ! in_array( $key, $languages ) ) {

readme.txt

@@ -4,7 +4,7 @@ Contributors: valexar
 Tags: localization, multilanguage, multilingual, translation, multilang
 Requires at least: 4.7
 Tested up to: 4.7
-Stable tag: 1.0.1
+Stable tag: 1.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -116,6 +116,9 @@ Compatible with multisite not tested.
 
 == Changelog ==
 
+= 1.0.2 =
+* fix save translation for enable languages without deleting translations for disable languages
+
 = 1.0.1 =
 * fix update options when deleting language
 * fix set edit lang cookie

wp-multilang.php

@@ -8,7 +8,7 @@
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
  * Text Domain:     wpm
  * Domain Path:     /languages
- * Version:         1.0.1
+ * Version:         1.0.2
  *
  * @package  WPM
  * @category Core
@@ -33,7 +33,7 @@
 	 * Main WP_Multilang.
 	 *
 	 * @class   WPM
-	 * @version 1.0.1
+	 * @version 1.0.2
 	 */
 	final class WP_Multilang {
 
@@ -42,7 +42,7 @@ final class WP_Multilang {
 		 *
 		 * @var string
 		 */
-		public $version = '1.0.1';
+		public $version = '1.0.2';
 
 		/**
 		 * The single instance of the class.