From a70ffe1d95a127d0a98f91837ef1554e1a93353f Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Tue, 16 Feb 2016 22:36:36 +0100 Subject: [PATCH] Fixed issue #10488: Missing translation --- application/controllers/admin/authentication.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/application/controllers/admin/authentication.php b/application/controllers/admin/authentication.php index 0dc624c8ff2..35251a45c5a 100644 --- a/application/controllers/admin/authentication.php +++ b/application/controllers/admin/authentication.php @@ -27,14 +27,6 @@ class Authentication extends Survey_Common_Action { - /** - * Reused email message - * - * @var string - * @access private - */ - private $sent_email_message = 'If username and email are valid and you are allowed to use internal database authentication a new password has been sent to you'; - /** * Show login screen and parse login data */ @@ -134,7 +126,7 @@ public function logout() App()->getPluginManager()->dispatchEvent($beforeLogout); // Expire the CSRF cookie $cookie = new CHttpCookie('YII_CSRF_TOKEN', ''); - $cookie->expire = time()-3600; + $cookie->expire = time()-3600; Yii::app()->request->cookies['YII_CSRF_TOKEN'] = $cookie; App()->user->logout(); App()->user->setFlash('loginmessage', gT('Logout successful.')); @@ -170,7 +162,7 @@ public function forgotpassword() if (count($aFields) < 1 || ($aFields[0]['uid'] != 1 && !Permission::model()->hasGlobalPermission('auth_db','read',$aFields[0]['uid']))) { // Wrong or unknown username and/or email. For security reasons, we don't show a fail message - $aData['message'] = '
'.gT($this->sent_email_message).'
'; + $aData['message'] = '
'.gT('If username and email are valid and you are allowed to use internal database authentication a new password has been sent to you').'
'; } else { @@ -209,7 +201,7 @@ private function _sendPasswordEmail($sEmailAddr, $aFields) { User::model()->updatePassword($aFields[0]['uid'], $sNewPass); // For security reasons, we don't show a successful message - $sMessage = gT($this->sent_email_message); + $sMessage = gT('If username and email are valid and you are allowed to use internal database authentication a new password has been sent to you'); } else {