Bug 1398340 - Typo in 2fa enrollment flow: "enrolment" (missing an L) (#232)

diff --git a/Bugzilla/MFA/TOTP.pm b/Bugzilla/MFA/TOTP.pm
index 843569ce738b0dcdceb32ec219aa1e5aa6f68c7d..131dea676947c674e025db937ad3e85a1577d57f 100644 (file)
--- 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 1aa92ead0fbc5e1612f16e70ba6a117df88f8643..a622a5eeea4d0cd84c4c4c6563901931bc7303b0 100644 (file)
--- 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 77f87cd65b4ab4593ca368c2aafc54b617bc114c..799efba7b7ab3bedcf987ee6e74a5755d067d1f1 100644 (file)
--- 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 1bfecf294ed69d7de41e151d1beb93c5bb61687b..00d266eef355c170eaae25ff4cbf6660931b122f 100755 (executable)
--- 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';