From 44b48df3901d829e1423749136d142964ccb4a3e Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Fri, 4 Jul 2003 04:31:13 +0000
Subject: 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.
---
.../en/default/account/auth/ldap-error.html.tmpl | 6 +-
template/en/default/account/auth/login.html.tmpl | 16 +++---
template/en/default/account/cancel-token.txt.tmpl | 15 +++--
template/en/default/account/create.html.tmpl | 17 +++---
.../en/default/account/email/change-new.txt.tmpl | 9 ++-
.../en/default/account/email/change-old.txt.tmpl | 11 ++--
template/en/default/account/exists.html.tmpl | 8 ++-
.../account/password/forgotten-password.txt.tmpl | 13 +++--
template/en/default/account/prefs/email.html.tmpl | 66 ++++++++++++----------
template/en/default/account/prefs/footer.html.tmpl | 36 ++++++------
.../en/default/account/prefs/permissions.html.tmpl | 22 ++++----
11 files changed, 125 insertions(+), 94 deletions(-)
(limited to 'template/en/default/account')
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 %]
-
+
[% PROCESS "global/hidden-fields.html.tmpl"
exclude="^Bugzilla_(login|password|restrictlogin)$" %]
-[%# 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 %]
[% IF Param("createemailregexp") %]
- If you don't have a Bugzilla account, you can
+ If you don't have a [% terms.Bugzilla %] account, you can
create a new account.