From 55596ef8c29ae876c718946d54de787f32033db0 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Thu, 28 Aug 2008 04:26:13 +0000
Subject: Bug 399070: Remove the 'timezone' parameter - Patch by Frédéric
 Buclin <LpSolit@gmail.com> r/a=mkanat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/en/default/admin/params/core.html.tmpl  | 4 ----
 template/en/default/bug/summarize-time.html.tmpl | 2 --
 template/en/default/list/list.atom.tmpl          | 9 +++------
 template/en/default/list/list.csv.tmpl           | 3 +--
 template/en/default/list/list.ics.tmpl           | 6 +++---
 template/en/default/whine/schedule.html.tmpl     | 6 +-----
 6 files changed, 8 insertions(+), 22 deletions(-)

(limited to 'template/en')

diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl
index ae1d995fb..d66c4a51b 100644
--- a/template/en/default/admin/params/core.html.tmpl
+++ b/template/en/default/admin/params/core.html.tmpl
@@ -60,10 +60,6 @@
                 "all sites served by this web server or virtual host to read " _
                 "$terms.Bugzilla cookies.",
 
-  timezone => "The timezone that your database server lives in, " _
-              "such as UTC, PDT or JST. If set to '', " _
-              "then the timezone will not be displayed with the timestamps.",
-
   utf8 => "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New " _
           "installations should set this to true to avoid character encoding " _
           "problems. <strong>Existing databases should set this to true " _
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index b8bd0737e..14ae68da2 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -14,8 +14,6 @@
   #                 Frédéric Buclin <LpSolit@gmail.com>
   #%]
 
-[% USE date %]
-
 [% PROCESS "global/field-descs.none.tmpl" %]
 
 [% title = "Time Summary " %]
diff --git a/template/en/default/list/list.atom.tmpl b/template/en/default/list/list.atom.tmpl
index bfebbb8dd..5086a044c 100644
--- a/template/en/default/list/list.atom.tmpl
+++ b/template/en/default/list/list.atom.tmpl
@@ -24,7 +24,6 @@
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
-[% USE date %]
 
 [% DEFAULT title = "$terms.Bugzilla $terms.Bugs" %]
 
@@ -37,9 +36,8 @@
   <link rel="self" type="application/atom+xml"
         href="[% urlbase FILTER html %]buglist.cgi?
         [%- urlquerypart FILTER xml %]"/>
-  <updated>[% date.format(format=>"%Y-%m-%dT%H:%M:%SZ",
-              time=>bugs.nsort('changedtime').last.changedtime,
-              gmt=>1) FILTER xml %]</updated>
+  <updated>[% bugs.nsort('changedtime').last.changedtime FILTER time("%Y-%m-%dT%H:%M:%SZ", "UTC")
+    FILTER xml %]</updated>
   <id>[% urlbase FILTER html %]buglist.cgi?[% urlquerypart FILTER xml %]</id>
 
   [% FOREACH bug = bugs %]
@@ -52,8 +50,7 @@
     <author>
       <name>[% bug.reporter_realname FILTER xml %]</name>
     </author>
-    <updated>[% date.format(format=>"%Y-%m-%dT%H:%M:%SZ",time=>bug.changedtime,
-                gmt=>1) FILTER xml %]</updated> 
+    <updated>[% bug.changedtime FILTER time("%Y-%m-%dT%H:%M:%SZ", "UTC") FILTER xml %]</updated>
     <summary type="html">
       [%# Filter out the entire block, so that we don't need to escape the html code out %]
       [% FILTER xml %]
diff --git a/template/en/default/list/list.csv.tmpl b/template/en/default/list/list.csv.tmpl
index 9ce1c73f1..1a25b3907 100644
--- a/template/en/default/list/list.csv.tmpl
+++ b/template/en/default/list/list.csv.tmpl
@@ -20,7 +20,6 @@
   #%]
 
 [% PROCESS "global/field-descs.none.tmpl" %]
-[% USE date %]
 
 [% colsepchar = user.settings.csv_colsepchar.value %]
 
@@ -35,7 +34,7 @@ bug_id
       [% colsepchar %]
       [% IF column == "opendate" OR column == "changeddate" %]
         [% rawcolumn = column.replace("date", "time") %]
-        [% bug.$column = date.format(bug.$rawcolumn, "%Y-%m-%d %H:%M:%S") %]
+        [% bug.$column = bug.$rawcolumn FILTER time("%Y-%m-%d %H:%M:%S") %]
       [% ELSIF column == 'bug_status' %]
         [% bug.$column = get_status(bug.$column) %]
       [% ELSIF column == 'resolution' %]
diff --git a/template/en/default/list/list.ics.tmpl b/template/en/default/list/list.ics.tmpl
index f8953d996..d30b0658c 100644
--- a/template/en/default/list/list.ics.tmpl
+++ b/template/en/default/list/list.ics.tmpl
@@ -31,7 +31,7 @@ BEGIN:VTODO
 [%+ PROCESS ics_status bug_status = bug.bug_status +%]
 [%+ PROCESS ics_dtstamp +%]
 [% IF bug.changeddate %]
-[%+ time2str("%Y%m%dT%H%M%SZ", bug.changedtime, "UTC") FILTER ics('LAST-MODIFIED') +%]
+[%+ bug.changedtime FILTER time("%Y%m%dT%H%M%SZ", "UTC") FILTER ics('LAST-MODIFIED') +%]
 [% END %]
 [% IF bug.percentage_complete %]
 [%+ bug.percentage_complete FILTER format('%d') FILTER ics('PERCENT-COMPLETE') +%]
@@ -65,11 +65,11 @@ END:VCALENDAR
 [% END %]
 
 [% BLOCK ics_dtstart %]
-  [% time2str("%Y%m%dT%H%M%SZ", bug.opentime, "UTC") FILTER ics('DTSTART') %]
+  [% bug.opentime FILTER time("%Y%m%dT%H%M%SZ", "UTC") FILTER ics('DTSTART') %]
 [% END %]
 
 [% BLOCK ics_dtstamp %]
-  [% time2str("%Y%m%dT%H%M%SZ", currenttime, "UTC") FILTER ics('DTSTAMP') %]
+  [% currenttime FILTER time("%Y%m%dT%H%M%SZ", "UTC") FILTER ics('DTSTAMP') %]
 [% END %]
 
 [% BLOCK ics_status %]
diff --git a/template/en/default/whine/schedule.html.tmpl b/template/en/default/whine/schedule.html.tmpl
index 8cb120dfa..c60243d42 100644
--- a/template/en/default/whine/schedule.html.tmpl
+++ b/template/en/default/whine/schedule.html.tmpl
@@ -71,11 +71,7 @@
 </p>
 
 <p>
-  [% IF Param("timezone") %]
-    All times are server local time ([% Param("timezone") FILTER upper %]).
-  [% ELSE %]
-    All times are server local time.
-  [% END %]
+  All times are server local time ([% local_timezone FILTER html %]).
 </p>
 
 <form method="post" action="editwhines.cgi">
-- 
cgit v1.2.3-24-g4f1b