From 0b3f9b4bb6d197395b723d27f3009e7aab06425b Mon Sep 17 00:00:00 2001 From: yuriinalivaiko Date: Sun, 19 Mar 2023 17:24:47 +0200 Subject: [PATCH] - fixed locale for loading MO file --- includes/class-init.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/includes/class-init.php b/includes/class-init.php index a75c8c61..a9ecc396 100644 --- a/includes/class-init.php +++ b/includes/class-init.php @@ -198,7 +198,9 @@ if ( ! class_exists( 'UM' ) ) { $this->honeypot = 'um_request'; // textdomain loading - $this->localize(); + add_action( 'plugins_loaded', function() { + $this->localize(); + } ); // include UM classes $this->includes(); @@ -235,7 +237,7 @@ if ( ! class_exists( 'UM' ) ) { * 'ultimate-member' by default */ function localize() { - $language_locale = ( get_locale() != '' ) ? get_locale() : 'en_US'; + $language_locale = function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale(); /** * UM hook @@ -306,6 +308,7 @@ if ( ! class_exists( 'UM' ) ) { */ $language_file = apply_filters( 'um_language_file', $language_file ); + unload_textdomain( $language_domain, true ); load_textdomain( $language_domain, $language_file ); } @@ -1292,7 +1295,7 @@ if ( ! class_exists( 'UM' ) ) { return $this->classes['files']; } - + /** * @since 2.0.21 *