From 24ad858514896ad470e73abe0fa6e97a813efa4e Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Thu, 15 Aug 2002 14:14:31 +0000
Subject: Bug 162216 - colchange.cgi, buglist.cgi and page.cgi messages should
be l10nable. Patch by burnus; r=gerv.
---
buglist.cgi | 25 +++++++-------------
colchange.cgi | 3 +--
page.cgi | 3 +--
template/en/default/global/messages.html.tmpl | 34 +++++++++++++++++++++++++++
4 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/buglist.cgi b/buglist.cgi
index 9570cdab3..cf25811da 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -58,12 +58,7 @@ use vars qw($db_name
@versions);
if (length($::buffer) == 0) {
- $vars->{'title'} = "Parameters Required";
- $vars->{'message'} = "This script is not meant to be invoked without any
- search terms.";
- $vars->{'url'} = "query.cgi";
- $vars->{'link'} = "Please use the search form to specify some search
- criteria.";
+ $vars->{'message'} = "buglist_parameters_required";
print "Refresh: 10; URL=query.cgi\n";
print "Content-Type: text/html\n\n";
$template->process("global/message.html.tmpl", $vars)
@@ -138,9 +133,8 @@ if ($::buffer =~ /&cmd-/) {
print "Refresh: 0; URL=$url\n";
print "Content-Type: text/html\n\n";
# Generate and return the UI (HTML page) from the appropriate template.
- $vars->{'title'} = "Adding field to query page...";
+ $vars->{'message'} = "buglist_adding_field";
$vars->{'url'} = $url;
- $vars->{'link'} = "Click here if the page does not redisplay automatically.";
$template->process("global/message.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
exit;
@@ -259,9 +253,9 @@ if ($::FORM{'cmdtype'} eq "dorem") {
print "Refresh: 0; URL=$url\n";
print "Content-Type: text/html\n\n";
# Generate and return the UI (HTML page) from the appropriate template.
- $vars->{'title'} = "Loading your query named $::FORM{'namedcmd'}";
+ $vars->{'message'} = "buglist_load_named_query";
+ $vars->{'namedcmd'} = $::FORM{'namedcmd'};
$vars->{'url'} = $url;
- $vars->{'link'} = "Click here if the page does not redisplay automatically.";
$template->process("global/message.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
exit;
@@ -283,10 +277,9 @@ if ($::FORM{'cmdtype'} eq "dorem") {
print "Content-Type: text/html\n\n";
# Generate and return the UI (HTML page) from the appropriate template.
- $vars->{'title'} = "Query is gone";
- $vars->{'message'} = "OK, the $::FORM{'namedcmd'} query is gone.";
+ $vars->{'message'} = "buglist_query_gone";
+ $vars->{'namedcmd'} = $::FORM{'namedcmd'};
$vars->{'url'} = "query.cgi";
- $vars->{'link'} = "Go back to the query page.";
$template->process("global/message.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
exit;
@@ -301,8 +294,7 @@ elsif ($::FORM{'cmdtype'} eq "doit" && $::FORM{'remember'}) {
SendSQL("REPLACE INTO namedqueries (userid, name, query)
VALUES ($userid, $qname, $qbuffer)");
# Generate and return the UI (HTML page) from the appropriate template.
- $vars->{'message'} = "OK, you now have a new default query. You may
- also bookmark the result of any individual query.";
+ $vars->{'message'} = "buglist_new_default_query";
}
elsif ($::FORM{'remember'} == 1 && $::FORM{'remtype'} eq "asnamed") {
confirm_login();
@@ -350,7 +342,8 @@ elsif ($::FORM{'cmdtype'} eq "doit" && $::FORM{'remember'}) {
push(@{$vars->{'user'}{'queries'}}, \%query);
}
- $vars->{'message'} = "OK, you have a new query named $name.";
+ $vars->{'message'} = "buglist_new_named_query";
+ $vars->{'queryname'} = $name;
}
}
diff --git a/colchange.cgi b/colchange.cgi
index ef650a4d2..4b1cfc819 100755
--- a/colchange.cgi
+++ b/colchange.cgi
@@ -86,8 +86,7 @@ if (defined $::FORM{'rememberedquery'}) {
print "Set-Cookie: SPLITHEADER=$::FORM{'splitheader'} ; path=$cookiepath ; expires=Sun, 30-Jun-2029 00:00:00 GMT\n";
print "Refresh: 0; URL=buglist.cgi?$::FORM{'rememberedquery'}\n";
print "Content-type: text/html\n\n";
- $vars->{'message'} = "Resubmitting your query with new columns...";
- $vars->{'title'} = "Change columns";
+ $vars->{'message'} = "change_columns";
$template->process("global/message.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
exit;
diff --git a/page.cgi b/page.cgi
index eefe86065..fb53f8b47 100755
--- a/page.cgi
+++ b/page.cgi
@@ -52,8 +52,7 @@ if (defined $::FORM{'id'}) {
}
}
-$vars->{'title'} = "Page not found";
-$vars->{'message'} = "The page you requested cannot be found.";
+$vars->{'message'} = "page_not_found";
$template->process("global/message.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 9d96cd37b..02d19969e 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -32,6 +32,36 @@
of the message. It can contain arbitrary HTML, and also references
to any [% parameters %] which you may have set.
+ [% ELSIF message_tag == "buglist_adding_field" %]
+ [% title = "Adding field to query page..." %]
+ [% link = "Click here if the page does not redisplay automatically." %]
+ [% # --- %]
+ [% ELSIF message_tag == "buglist_load_named_query" %]
+ [% title = BLOCK %]Loading your query named [% namedcmd %][% END %]
+ [% link = "Click here if the page does not redisplay automatically." %]
+ [% # --- %]
+ [% ELSIF message_tag == "buglist_new_default_query" %]
+ OK, you now have a new default query. You may
+ also bookmark the result of any individual query.
+
+ [% ELSIF message_tag == "buglist_new_named_query" %]
+ OK, you have a new query named [% queryname FILTER html %]."
+
+ [% ELSIF message_tag == "buglist_parameters_required" %]
+ [% title = "Parameters Required" %]
+ [% url = "query.cgi" %]
+ [% link = "Please use the search form to specify some search criteria." %]
+ This script is not meant to be invoked without any search terms.
+
+ [% ELSIF message_tag == "buglist_query_gone" %]
+ [% title = "Query is gone" %]
+ [% link = "Go back to the query page." %]
+ OK, the [% namedcmd FILTER html %] query is gone.
+
+ [% ELSIF message_tag == "change_columns" %]
+ [% title = "Change columns" %]
+ Resubmitting your query with new columns...
+
[% ELSIF message_tag == "logged_out" %]
[% title = "Logged Out" %]
[% url = "query.cgi?GoAheadAndLogIn=1" %]
@@ -44,6 +74,10 @@
[% title = "Bugzilla Login Changed" %]
Your Bugzilla login has been changed.
+ [% ELSIF message_tag == "page_not_found" %]
+ [% title = "Page not found" %]
+ The page you requested cannot be found.
+
[% ELSIF message_tag == "password_changed" %]
[% title = "Password Changed" %]
Your password has been changed.
--
cgit v1.2.3-24-g4f1b