From d69b9a45e9b7031fc569ca1970abd012a84fede1 Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Thu, 17 Oct 2002 06:15:44 +0000
Subject: Bug 174221 - field names should be l10n in user-errors.html.tmpl.
Patch by jeff.hedlund@matrixsi.com; r=burnus, gerv.
---
process_bug.cgi | 4 ++--
template/en/default/global/field-descs.html.tmpl | 6 +++++-
template/en/default/global/user-error.html.tmpl | 6 ++++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/process_bug.cgi b/process_bug.cgi
index 439587178..43895ced3 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -710,7 +710,7 @@ foreach my $field ("estimated_time", "remaining_time") {
my $er_time = trim($::FORM{$field});
if ($er_time ne $::FORM{'dontchange'}) {
if ($er_time > 99999.99) {
- ThrowUserError("value_out_of_range", {variable => $field});
+ ThrowUserError("value_out_of_range", {field => $field});
}
if ($er_time =~ /^(?:\d+(?:\.\d*)?|\.\d+)$/) {
DoComma();
@@ -1199,7 +1199,7 @@ foreach my $id (@idlist) {
$timestamp = FetchOneColumn();
if ($::FORM{'work_time'} > 99999.99) {
- ThrowUserError("value_out_of_range", {variable => 'work_time'});
+ ThrowUserError("value_out_of_range", {field => 'work_time'});
}
if (defined $::FORM{'comment'} || defined $::FORM{'work_time'}) {
if ($::FORM{'work_time'} != 0 &&
diff --git a/template/en/default/global/field-descs.html.tmpl b/template/en/default/global/field-descs.html.tmpl
index 4e97c11f5..f8ffd4228 100644
--- a/template/en/default/global/field-descs.html.tmpl
+++ b/template/en/default/global/field-descs.html.tmpl
@@ -33,14 +33,17 @@
"component" => "Component",
"creation_ts" => "Bug Creation time",
"delta_ts" => "Last Changed time",
+ "estimated_time" => "Orig. Est.",
"everconfirmed" => "Ever confirmed?",
"groupset" => "Groupset",
"keywords" => "Keywords",
"op_sys" => "OS",
+ "percentage_complete" => "%Complete",
"priority" => "Priority",
"product_id" => "Product ID",
"product" => "Product",
"qa_contact" => "QA Contact",
+ "remaining_time" => "Hours Left",
"rep_platform" => "Hardware",
"reporter" => "Reporter",
"reporter_accessible" => "Reporter accessible?",
@@ -49,4 +52,5 @@
"status_whiteboard" => "Whiteboard",
"target_milestone" => "Target Milestone",
"version" => "Version",
- "votes" => "Votes" } %]
+ "votes" => "Votes",
+ "work_time" => "Hours Worked"} %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 0c964b190..ddc9ce11c 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -29,6 +29,8 @@
# alphabetical order by error tag, and leave a blank line between errors.
#%]
+[% PROCESS "global/field-descs.html.tmpl" %]
+
[% DEFAULT title = "Error" %]
[% error_message = BLOCK %]
@@ -345,7 +347,7 @@
[% ELSIF error == "need_positive_number" %]
[% title = "Positive Number Required" %]
- [% field %] requires a positive number.
+ The [% field_descs.$field %] field requires a positive number.
[% ELSIF error == "need_product" %]
[% title = "Product Required" %]
@@ -543,7 +545,7 @@
[% ELSIF error == "value_out_of_range" %]
[% title = "Value Out Of Range" %]
- Value is out of range for field [% variable %].
+ Value is out of range for field [% field_descs.$field %].
[% ELSIF error == "z_axis_defined_with_no_x_axis" %]
[% title = "Nonsensical Options" %]
--
cgit v1.2.3-24-g4f1b