summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Auth/Verify/LDAP.pm2
-rw-r--r--extensions/GuidedBugEntry/web/js/guided.js4
-rw-r--r--t/006spellcheck.t1
-rw-r--r--template/en/default/global/code-error.html.tmpl2
4 files changed, 5 insertions, 4 deletions
diff --git a/Bugzilla/Auth/Verify/LDAP.pm b/Bugzilla/Auth/Verify/LDAP.pm
index 0f10f9fbf..9d438e411 100644
--- a/Bugzilla/Auth/Verify/LDAP.pm
+++ b/Bugzilla/Auth/Verify/LDAP.pm
@@ -111,7 +111,7 @@ sub check_credentials {
if ($mail_attr) {
if (!$user_entry->exists($mail_attr)) {
return { failure => AUTH_ERROR,
- error => "ldap_cannot_retreive_attr",
+ error => "ldap_cannot_retrieve_attr",
details => {attr => $mail_attr} };
}
diff --git a/extensions/GuidedBugEntry/web/js/guided.js b/extensions/GuidedBugEntry/web/js/guided.js
index 98ad6fd17..77847fb2e 100644
--- a/extensions/GuidedBugEntry/web/js/guided.js
+++ b/extensions/GuidedBugEntry/web/js/guided.js
@@ -232,7 +232,7 @@ var product = {
product.details = false;
bugForm.onProductUpdated();
if (err) {
- alert('Failed to retreive components for product "' +
+ alert('Failed to retrieve components for product "' +
productName + '":' + "\n\n" + err);
if (console)
console.error(err);
@@ -244,7 +244,7 @@ var product = {
product.details = false;
bugForm.onProductUpdated();
if (res.responseText) {
- alert('Failed to retreive components for product "' +
+ alert('Failed to retrieve components for product "' +
productName + '":' + "\n\n" + res.responseText);
if (console)
console.error(res);
diff --git a/t/006spellcheck.t b/t/006spellcheck.t
index fe631e389..e311be8ec 100644
--- a/t/006spellcheck.t
+++ b/t/006spellcheck.t
@@ -42,6 +42,7 @@ existant
paramater
refered
repsentation
+retreive
suported
varsion
);
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index c4ff7e73a..df6aac31d 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -316,7 +316,7 @@
Failed to bind to the LDAP server. The error message was:
<code>[% errstr FILTER html %]</code>
- [% ELSIF error == "ldap_cannot_retreive_attr" %]
+ [% ELSIF error == "ldap_cannot_retrieve_attr" %]
The specified LDAP attribute [% attr FILTER html %] was not found.
[% ELSIF error == "ldap_connect_failed" %]