From b20fddc330932c55945534f9a219d81aefaf62c0 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 9 Oct 2019 23:37:47 +0200 Subject: Fix API i18n (#2565) Fix https://github.com/FreshRSS/FreshRSS/issues/2564 --- p/api/fever.php | 3 +++ p/api/greader.php | 3 +++ 2 files changed, 6 insertions(+) (limited to 'p') diff --git a/p/api/fever.php b/p/api/fever.php index 30b85dafd..94d3a3b3d 100644 --- a/p/api/fever.php +++ b/p/api/fever.php @@ -165,9 +165,12 @@ class FeverAPI $user_conf = get_user_configuration($username); if ($user_conf != null && $feverKey === $user_conf->feverKey) { FreshRSS_Context::$user_conf = $user_conf; + Minz_Translate::init(FreshRSS_Context::$user_conf->language); $this->entryDAO = FreshRSS_Factory::createEntryDao(); $this->feedDAO = FreshRSS_Factory::createFeedDao(); return true; + } else { + Minz_Translate::init(); } Minz_Log::error('Fever API: Reset API password for user: ' . $username, API_LOG); Minz_Log::error('Fever API: Please reset your API password!'); diff --git a/p/api/greader.php b/p/api/greader.php index 24c43128b..66888b0ef 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -916,6 +916,9 @@ $user = authorizationToUser(); FreshRSS_Context::$user_conf = null; if ($user !== '') { FreshRSS_Context::$user_conf = get_user_configuration($user); + Minz_Translate::init(FreshRSS_Context::$user_conf->language); +} else { + Minz_Translate::init(); } Minz_Session::_param('currentUser', $user); -- cgit v1.2.3