Bug 13540 - allow key terms, like "Bugzilla" and "bug", to be altered without changing all the templates. Patch by jwilmoth@starbucks.com; r=gerv, a=justdave.

2 files changed, 13 insertions, 9 deletions

diff --git a/template/en/default/account/auth/ldap-error.html.tmpl b/template/en/default/account/auth/ldap-error.html.tmpl
index 7615fb326..cc21ba277 100644
--- a/template/en/default/account/auth/ldap-error.html.tmpl
+++ b/template/en/default/account/auth/ldap-error.html.tmpl
@@ -25,6 +25,8 @@
   #   of the error.
   #%]
 
+[% PROCESS global/variables.none.tmpl %]
+
 [% SWITCH auth_err_tag %]
   [% CASE "cannot_retreive_attr" %]
     The specified LDAP attribute [% info.attr FILTER html %] was not found.
@@ -36,12 +38,12 @@
     [% END %]
 
   [% CASE "no_userid" %]
-    Bugzilla created a new account for you, but then could not find the
+    [% terms.Bugzilla %] created a new account for you, but then could not find the
     new userid.
 
   [% CASE "server_not_defined" %]
     The LDAP server for authentication has not been defined.
-    
+
   [% CASE %]
     Unhandled authentication error: [% auth_err_tag FILTER html %]
 
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index f342b1791..a2587300e 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -22,11 +22,13 @@
 [%# INTERFACE:
   # target: string. URL to go to after login.
   # form: hash; the form values which need to be submitted to the target script
-  # mform: hash; the form values with multiple values which need to be 
+  # mform: hash; the form values with multiple values which need to be
   #   submitted to the target script
   #%]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl
   title = "Login"
 %]
 
@@ -68,23 +70,23 @@
     [% END %]
     </tr>
   </table>
-  
+
   [% PROCESS "global/hidden-fields.html.tmpl"
      exclude="^Bugzilla_(login|password|restrictlogin)$" %]
 
   <input type="submit" name="GoAheadAndLogIn" value="Login">
 </form>
 
-[%# Allow the user to create a new account, or request a token to change 
+[%# Allow the user to create a new account, or request a token to change
   # their password, assuming that our auth method allows that.
   #%]
-  
+
 [% IF caneditaccount %]
   <hr>
 
   [% IF Param("createemailregexp") %]
     <p>
-      If you don't have a Bugzilla account, you can 
+      If you don't have a [% terms.Bugzilla %] account, you can
       <a href="createaccount.cgi">create a new account</a>.
     </p>
   [% END %]
@@ -92,7 +94,7 @@
   <form method="get" action="token.cgi">
     <input type="hidden" name="a" value="reqpw">
     If you have an account, but have forgotten your password,
-    enter your login name below and submit a request 
+    enter your login name below and submit a request
     to change your password.<br>
     <input size="35" name="loginname">
     <input type="submit" value="Submit Request">