From a53cfcb9d1ca3f77dcebac9bd584bb1992aac815 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 13 Jun 2014 16:02:41 +0200 Subject: [PATCH] =?UTF-8?q?Migrate=20=C2=B4=20to=20'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/js/lostpassword.js | 4 ++-- core/lostpassword/controller/lostcontroller.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js index b0bd0e01b7..bec4f98b9f 100644 --- a/core/js/lostpassword.js +++ b/core/js/lostpassword.js @@ -1,7 +1,7 @@ OC.Lostpassword = { - sendErrorMsg : t('core', 'Couldn’t send reset email. Please contact your administrator.'), - + sendErrorMsg : t('core', 'Couldn\'t send reset email. Please contact your administrator.'), + sendSuccessMsg : t('core', 'The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.
If it is not there ask your local administrator.'), encryptedMsg : t('core', "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.
If you are not sure what to do, please contact your administrator before you continue.
Do you really want to continue?") diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php index a13d6a26d5..db94eeadea 100644 --- a/core/lostpassword/controller/lostcontroller.php +++ b/core/lostpassword/controller/lostcontroller.php @@ -130,7 +130,7 @@ class LostController extends Controller { if (!$this->userManager->userExists($user)) { throw new \Exception( - $this->l10n->t('Couldn’t send reset email. Please make sure '. + $this->l10n->t('Couldn\'t send reset email. Please make sure '. 'your username is correct.')); } @@ -145,7 +145,7 @@ class LostController extends Controller { if (empty($email)) { throw new \Exception( - $this->l10n->t('Couldn’t send reset email because there is no '. + $this->l10n->t('Couldn\'t send reset email because there is no '. 'email address for this username. Please ' . 'contact your administrator.') ); @@ -169,7 +169,7 @@ class LostController extends Controller { ); } catch (\Exception $e) { throw new \Exception($this->l10n->t( - 'Couldn’t send reset email. Please contact your administrator.' + 'Couldn\'t send reset email. Please contact your administrator.' )); } }