[MediaWiki-commits] [Gerrit] Change invalid password reset form language - change (mediawiki/core)

2016-06-10 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Change invalid password reset form language
..


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
(cherry picked from commit 216d7774460ad3edd3075193ef91a5979c3c)
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 4ced6df..fc9a0f1 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.}}",

-- 
To view, visit https://gerrit.wikimedia.org/r/293773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I38ac7883d2acfc73c5662dc2c382a395ef1b91c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Change invalid password reset form language - change (mediawiki/core)

2016-06-10 Thread Code Review
Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293773

Change subject: Change invalid password reset form language
..

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
(cherry picked from commit 216d7774460ad3edd3075193ef91a5979c3c)
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/73/293773/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 4ced6df..fc9a0f1 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.}}",

-- 
To view, visit https://gerrit.wikimedia.org/r/293773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38ac7883d2acfc73c5662dc2c382a395ef1b91c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Change invalid password reset form language - change (mediawiki/core)

2016-06-07 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Change invalid password reset form language
..


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
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 9432cad..a028283 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.}}",

-- 
To view, visit https://gerrit.wikimedia.org/r/293231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I38ac7883d2acfc73c5662dc2c382a395ef1b91c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Change invalid password reset form language - change (mediawiki/core)

2016-06-07 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Change invalid password reset form language
..


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
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Anomie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index e6a8141..f9a31d1 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.}}",

-- 
To view, visit https://gerrit.wikimedia.org/r/293094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I38ac7883d2acfc73c5662dc2c382a395ef1b91c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Change invalid password reset form language - change (mediawiki/core)

2016-06-07 Thread Code Review
Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293231

Change subject: Change invalid password reset form language
..

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
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/31/293231/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 9432cad..a028283 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.}}",

-- 
To view, visit https://gerrit.wikimedia.org/r/293231
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38ac7883d2acfc73c5662dc2c382a395ef1b91c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.5
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Change invalid password reset form language - change (mediawiki/core)

2016-06-07 Thread Code Review
Gergő Tisza has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293094

Change subject: Change invalid password reset form language
..

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
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/293094/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index e6a8141..f9a31d1 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.}}",

-- 
To view, visit https://gerrit.wikimedia.org/r/293094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38ac7883d2acfc73c5662dc2c382a395ef1b91c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits