From 4ee7724149fb9e27d869a931a26585b9a552e08c Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 14 May 2013 11:32:21 -0400 Subject: [PATCH] CC-4864: I18N: Password reset page is not translated --- airtime_mvc/application/controllers/LoginController.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php index c95a12f0a..edb8222d7 100644 --- a/airtime_mvc/application/controllers/LoginController.php +++ b/airtime_mvc/application/controllers/LoginController.php @@ -108,6 +108,9 @@ class LoginController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'js/airtime/login/password-restore.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $request = $this->getRequest(); + Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA')); + if (!Application_Model_Preference::GetEnableSystemEmail()) { $this->_redirect('login'); } else { @@ -149,6 +152,9 @@ class LoginController extends Zend_Controller_Action public function passwordRestoreAfterAction() { + $request = $this->getRequest(); + Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA')); + //uses separate layout without a navigation. $this->_helper->layout->setLayout('login'); } @@ -166,6 +172,8 @@ class LoginController extends Zend_Controller_Action $auth = new Application_Model_Auth(); $user = CcSubjsQuery::create()->findPK($user_id); + Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA')); + //check validity of token if (!$auth->checkToken($user_id, $token, 'password.restore')) { Logging::debug("token not valid");