Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-4864: I18N: Password reset page is not translated

Browse source
This commit is contained in:
denise 2013-05-14 11:32:21 -04:00
parent c173744929
commit 4ee7724149
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/controllers/LoginController.php
View file

@ -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'); $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()) { if (!Application_Model_Preference::GetEnableSystemEmail()) {
$this->_redirect('login'); $this->_redirect('login');
} else { } else {
@ -149,6 +152,9 @@ class LoginController extends Zend_Controller_Action
public function passwordRestoreAfterAction() public function passwordRestoreAfterAction()
{ {
$request = $this->getRequest();
Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
//uses separate layout without a navigation. //uses separate layout without a navigation.
$this->_helper->layout->setLayout('login'); $this->_helper->layout->setLayout('login');
} }
@ -166,6 +172,8 @@ class LoginController extends Zend_Controller_Action
$auth = new Application_Model_Auth(); $auth = new Application_Model_Auth();
$user = CcSubjsQuery::create()->findPK($user_id); $user = CcSubjsQuery::create()->findPK($user_id);
Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
//check validity of token //check validity of token
if (!$auth->checkToken($user_id, $token, 'password.restore')) { if (!$auth->checkToken($user_id, $token, 'password.restore')) {
Logging::debug("token not valid"); Logging::debug("token not valid");