fix load theme localization files

Author: VaLeXaR

core/class-wpm-setup.php

@@ -12,7 +12,7 @@
  * Class WPM_Setup
  * @package  WPM\Core
  * @author   VaLeXaR
- * @version  1.2.0
+ * @version  1.2.1
  */
 class WPM_Setup {
 
@@ -99,6 +99,7 @@ public function __construct() {
 		add_action( 'upgrader_process_complete', __NAMESPACE__ . '\WPM_Config::load_config_run' );
 		add_action( 'wpm_init', array( $this, 'load_vendor' ) );
 		add_action( 'template_redirect', array( $this, 'set_not_found' ) );
+		add_action( 'init', array( $this, 'switch_to_language' ) );
 		$this->init();
 	}
 
@@ -282,18 +283,15 @@ public function set_user_language() {
 	 * Set locale from user language
 	 */
 	public function set_locale() {
-
-		if ( ! did_action( 'before_wpm_init' ) ) {
-			return;
-		}
+		global $locale;
 
 		$languages      = $this->get_languages();
 		$default_locale = $this->get_default_locale();
 
 		foreach ( $languages as $key => $value ) {
 			$user_language = $this->get_user_language();
 			if ( ( $value == $user_language ) ) {
-				switch_to_locale( $key );
+				$locale = $key;
 				if ( $key == $default_locale && ! is_admin() && ! isset( $_GET['lang'] ) ) {
 					wp_redirect( home_url( str_replace( '/' . $user_language . '/', '/', $_SERVER['REQUEST_URI'] ) ) );
 					exit;
@@ -460,12 +458,19 @@ private function get_browser_language() {
 	 * Set 404 headers for not available language
 	 */
 	public function set_not_found() {
-		$languages      = $this->get_languages();
+		$languages = $this->get_languages();
 
 		if ( ! in_array( $this->user_language, $languages ) ) {
 			global $wp_query;
 			$wp_query->set_404();
 			status_header( 404 );
 		}
 	}
+
+	/**
+	 * Switch locale to language
+	 */
+	public function switch_to_language() {
+		switch_to_locale( get_locale() );
+	}
 }

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.4
+Stable tag: 1.3.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -133,6 +133,10 @@ Compatible with multisite not tested.
 
 == Changelog ==
 
+= 1.3.5 =
+* hide wp language settings
+* fix load theme localization files
+
 = 1.3.4 =
 * add 404 error for not available language
 * fix translate option in init

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.4
+ * Version:         1.3.5
  *
  * @package  WPM
  * @category Core
@@ -33,7 +33,7 @@
 	 * Main WP_Multilang.
 	 *
 	 * @class   WPM
-	 * @version 1.0.2
+	 * @version 1.0.3
 	 */
 	final class WP_Multilang {
 
@@ -42,7 +42,7 @@ final class WP_Multilang {
 		 *
 		 * @var string
 		 */
-		public $version = '1.3.4';
+		public $version = '1.3.5';
 
 		/**
 		 * The single instance of the class.
@@ -99,6 +99,7 @@ public function __construct() {
 		private function init_hooks() {
 			register_activation_hook( __FILE__, array( 'WPM\Core\WPM_Install', 'install' ) );
 			add_action( 'init', array( $this, 'init' ), 0 );
+			add_action( 'setup_theme', array( $this, 'setup' ), 0 );
 		}
 
 		/**
@@ -158,15 +159,18 @@ public function includes() {
 			}
 		}
 
+
+		public function setup() {
+			Core\WPM_Setup::instance();
+		}
+
 		/**
 		 * Init Multilang when WordPress Initialises.
 		 */
 		public function init() {
 			// Before init action.
 			do_action( 'before_wpm_init' );
 
-			Core\WPM_Setup::instance();
-
 			// Set up localisation.
 			$this->load_plugin_textdomain();