From 216d7aaaa774460ad3edd3075193ef91a5979c3c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerg=C5=91=20Tisza?= Date: Tue, 7 Jun 2016 11:24:37 +0000 Subject: [PATCH] Change invalid password reset form language The old workflow was login -> go to a password change form (at which point the user is fully logged on and can just abandon the form). The AuthManager workflow is go through a string of login providers (including the password reset), and get logged in at the very end - so the user has to submit the form. The submit button text for not updating the password was changed from Cancel to Skip to account for that; this patch updates the messages which reference that text. Bug: T136894 Change-Id: I38ac7883d2acfc73c5662dc2c382a395ef1b91c1 --- languages/i18n/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/i18n/en.json b/languages/i18n/en.json index e6a8141b0a..f9a31d15aa 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -585,8 +585,8 @@ "resetpass-temp-password": "Temporary password:", "resetpass-abort-generic": "Password change has been aborted by an extension.", "resetpass-expired": "Your password has expired. Please set a new password to log in.", - "resetpass-expired-soft": "Your password has expired and needs to be reset. Please choose a new password now, or click \"{{int:resetpass-submit-cancel}}\" to reset it later.", - "resetpass-validity-soft": "Your password is not valid: $1\n\nPlease choose a new password now, or click \"{{int:resetpass-submit-cancel}}\" to reset it later.", + "resetpass-expired-soft": "Your password has expired and needs to be reset. Please choose a new password now, or click \"{{int:authprovider-resetpass-skip-label}}\" to reset it later.", + "resetpass-validity-soft": "Your password is not valid: $1\n\nPlease choose a new password now, or click \"{{int:authprovider-resetpass-skip-label}}\" to reset it later.", "passwordreset": "Reset password", "passwordreset-text-one": "Complete this form to receive a temporary password via email.", "passwordreset-text-many": "{{PLURAL:$1|Fill in one of the fields to receive a temporary password via email.}}", -- 2.20.1