Bug 174221 - field names should be l10n in user-errors.html.tmpl. Patch by jeff.hedlu...

diff --git a/process_bug.cgi b/process_bug.cgi
index 439587178b89e60bb6cc350970d294604b026960..43895ced39e7157a096a064c4b6883ce6da16109 100755 (executable)
--- 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 4e97c11f551fdbef0872420b2d943b1d5ac25e1b..f8ffd422811f379aeb7a0cfbcf7328474a3f8bb7 100644 (file)
--- 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 0c964b190b4837d32066cdbc62bc4c2ba5fe7776..ddc9ce11c1efe3eb5e1917ae73c01b2015583922 100644 (file)
--- 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 <em>[% field_descs.$field %]</em> 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 <em>[% field_descs.$field %]</em>.
 
   [% ELSIF error == "z_axis_defined_with_no_x_axis" %]
     [% title = "Nonsensical Options" %]