Bug 1262039 - typo in error message "Failed to retreive components..."

diff --git a/Bugzilla/Auth/Verify/LDAP.pm b/Bugzilla/Auth/Verify/LDAP.pm
index 0f10f9fbfe9153305fa3d5eecb191644bbd73bb6..9d438e41183a36134bb8d62bae8468758bb7eca3 100644 (file)
--- 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 98ad6fd178050769f62b2667c089065afc022aa6..77847fb2e9a8db87a874d373ed6bab7054febd67 100644 (file)
--- 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 fe631e38900c5f40c9cfce0b743c83ca0359a762..e311be8eca7e0c5d983928ea1f046b3a3561e2d5 100644 (file)
--- 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 c4ff7e73ab9a7a3f493f17dc60f31f73739ae648..df6aac31dbaef7bb868eef180b982ce13409e23c 100644 (file)
--- 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" %]