summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-09-09 03:00:53 +0200
committerEmma Humphries <emceeaich@users.noreply.github.com>2017-09-09 03:00:53 +0200
commitd3cf76c62299d9ff9e3589a3c159571711d8d186 (patch)
treef088a2417d9c8d184040adccdf75f9cb211e73d3
parent946e9116c2a2a4ccbc44f657827087bf44ba295a (diff)
downloadbugzilla-d3cf76c62299d9ff9e3589a3c159571711d8d186.tar.gz
bugzilla-d3cf76c62299d9ff9e3589a3c159571711d8d186.tar.xz
Bug 1398340 - Typo in 2fa enrollment flow: "enrolment" (missing an L) (#232)
-rw-r--r--Bugzilla/MFA/TOTP.pm2
-rw-r--r--template/en/default/global/user-error.html.tmpl4
-rw-r--r--template/en/default/mfa/duo/verify.html.tmpl2
-rwxr-xr-xuserprefs.cgi2
4 files changed, 5 insertions, 5 deletions
diff --git a/Bugzilla/MFA/TOTP.pm b/Bugzilla/MFA/TOTP.pm
index 843569ce7..131dea676 100644
--- a/Bugzilla/MFA/TOTP.pm
+++ b/Bugzilla/MFA/TOTP.pm
@@ -70,7 +70,7 @@ sub check {
return if $self->_auth()->verify($code, 1);
if ($params->{mfa_action} && $params->{mfa_action} eq 'enable') {
- ThrowUserError('mfa_totp_bad_enrolment_code');
+ ThrowUserError('mfa_totp_bad_enrollment_code');
}
else {
ThrowUserError('mfa_bad_code');
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 1aa92ead0..a622a5eee 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1232,7 +1232,7 @@
[% ELSIF error == "mfa_bad_code" %]
Invalid verification code.
- [% ELSIF error == "mfa_totp_bad_enrolment_code" %]
+ [% ELSIF error == "mfa_totp_bad_enrollment_code" %]
Invalid verification code.<br>
<br>
The QR code has been deleted - please generate and scan a new code.
@@ -1401,7 +1401,7 @@
[% ELSIF error == "reset_password_denied" %]
[% title = "Reset Password Denied" %]
- You cannot reset your password without administrative permission.
+ You cannot reset your password without administrative permission.
[% ELSIF error == "no_axes_defined" %]
[% title = "No Axes Defined" %]
diff --git a/template/en/default/mfa/duo/verify.html.tmpl b/template/en/default/mfa/duo/verify.html.tmpl
index 77f87cd65..799efba7b 100644
--- a/template/en/default/mfa/duo/verify.html.tmpl
+++ b/template/en/default/mfa/duo/verify.html.tmpl
@@ -6,7 +6,7 @@
# defined by the Mozilla Public License, v. 2.0.
#%]
-[% is_enrolment = action == "enable" %]
+[% is_enrollment = action == "enable" %]
[% js = BLOCK %]
$(function() {
diff --git a/userprefs.cgi b/userprefs.cgi
index 1bfecf294..00d266eef 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -655,7 +655,7 @@ sub SaveMFA {
my $reason;
if ($action eq 'enable') {
$provider->enroll(Bugzilla->input_params);
- $reason = 'Two-factor enrolment';
+ $reason = 'Two-factor enrollment';
}
elsif ($action eq 'recovery') {
$reason = 'Recovery code generation';