Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #1201 from mailpoet/user_profile_language_fix

Browse Source 
Changes plugin language based on user's locale [MAILPOET-1211]
This commit is contained in:
Tautvidas Sipavičius
2017-11-23 13:40:59 +02:00
committed by GitHub
parent d603d99a04 94c7e2a5c0
commit 20b59d11a7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Config/Initializer.php
View File

@@ -232,6 +232,7 @@ class Initializer {
$this->setupHooks(); $this->setupHooks();
$this->setupJSONAPI(); $this->setupJSONAPI();
$this->setupRouter(); $this->setupRouter();
$this->setupUserLocale();
} catch(\Exception $e) { } catch(\Exception $e) {
$this->handleFailedInitialization($e); $this->handleFailedInitialization($e);
} }
@@ -247,6 +248,13 @@ class Initializer {
$router->init(); $router->init();
} }
function setupUserLocale() {
if(get_user_locale() === get_locale()) return;
unload_textdomain(Env::$plugin_name);
$localizer = new Localizer();
$localizer->init();
}
function setupPages() { function setupPages() {
$pages = new \MailPoet\Settings\Pages(); $pages = new \MailPoet\Settings\Pages();
$pages->init(); $pages->init();

2
lib/Config/Localizer.php
View File

@@ -30,7 +30,7 @@ class Localizer {
function locale() { function locale() {
$locale = apply_filters( $locale = apply_filters(
'plugin_locale', 'plugin_locale',
get_locale(), get_user_locale(),
Env::$plugin_name Env::$plugin_name
); );
return $locale; return $locale;