fix many redirect

Author: VaLeXaR

README.md

@@ -70,6 +70,15 @@ For a switch as add code to this topic
 ```php
 if ( function_exists ( 'wpm_language_switcher' ) ) wpm_language_switcher ();
 ```
+
+Function accepts two parameters:
+
+$args - array  
+  'type' - 'list', 'dropdown'. Default - 'list'.  
+  'show' - 'flag', 'name', 'both'. Default - 'both'.
+
+$echo - bool
+
 Available features for translation:
 ```php
 wpm_translate_url ($url, $language = ''); // translate url
@@ -169,6 +178,15 @@ Features of the plugin **WP Multilang**:
 ```php
 <?php if ( function_exists( 'wpm_language_switcher' ) ) wpm_language_switcher(); ?>
 ```
+
+Фукція приймає два параметри:
+
+$args - array  
+  'type' - 'list', 'dropdown'. Усталено - 'list'.  
+  'show' - 'flag', 'name', 'both'. Усталено - 'both'.
+
+$echo - bool
+
 Доступні функції для перекладу:
 ```php
 wpm_translate_url( $url, $language = '' ); // translate url

core/class-wpm-setup.php

@@ -12,7 +12,7 @@
  * Class WPM_Setup
  * @package  WPM\Core
  * @author   VaLeXaR
- * @version  1.1.0
+ * @version  1.1.1
  */
 class WPM_Setup {
 
@@ -209,6 +209,9 @@ public function get_user_language() {
 	 */
 	public function set_user_language() {
 
+		$languages      = $this->get_languages();
+		$default_locale = $this->get_default_locale();
+
 		if ( ! is_admin() && ! defined( 'REST_REQUEST' ) ) {
 
 			$path = parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH );
@@ -229,8 +232,13 @@ public function set_user_language() {
 					if ( $browser_language != $this->user_language ) {
 
 						$base_url   = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+
 						$b_home_url = $base_url . '/' . $browser_language;
 
+						if ( $browser_language == $languages[ $default_locale ] ) {
+							$b_home_url = $base_url;
+						}
+
 						if ( $this->user_language ) {
 							$base_url = $base_url . '/' . $this->user_language;
 						}
@@ -243,9 +251,6 @@ public function set_user_language() {
 			}
 		}
 
-		$languages      = $this->get_languages();
-		$default_locale = $this->get_default_locale();
-
 		if ( isset( $_GET['lang'] ) ) {
 			$lang = wpm_clean( $_GET['lang'] );
 			if ( in_array( $lang, $languages ) ) {

readme.txt

@@ -4,7 +4,7 @@ Contributors: valexar
 Tags: localization, multilanguage, multilingual, translation, multilang
 Requires at least: 4.7
 Tested up to: 4.8
-Stable tag: 1.3.0
+Stable tag: 1.3.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -57,6 +57,7 @@ There are two ways:
 
 1. After json.
     Create the root of the subject, or the roots of its plugin file `wpm-config.json` with:
+
     `{
        "post_types": {
          "post": null
@@ -84,6 +85,14 @@ For a switch as add code to your template
 
 `if ( function_exists ( 'wpm_language_switcher' ) ) wpm_language_switcher ();`
 
+Function accepts two parameters:
+
+$args - array
+  'type' - 'list', 'dropdown'. Default - 'list'.
+  'show' - 'flag', 'name', 'both'. Default - 'both'.
+
+$echo - bool
+
 Available features for translation:
 
 `wpm_translate_url ($url, $language = '');` - translate url
@@ -124,6 +133,9 @@ Compatible with multisite not tested.
 
 == Changelog ==
 
+= 1.3.1 =
+* fix many redirect for first load
+
 = 1.3.0 =
 + add support Max Mega Menu
 + add support MasterSlider

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.3.0
+ * Version:         1.3.1
  *
  * @package  WPM
  * @category Core
@@ -42,7 +42,7 @@ final class WP_Multilang {
 		 *
 		 * @var string
 		 */
-		public $version = '1.3.0';
+		public $version = '1.3.1';
 
 		/**
 		 * The single instance of the class.