From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 9 May 2020 13:15:35 +0000 (+0200)
Subject: Merge branch 'UTC' into 'master'
X-Git-Url: https://code.wpia.club/?p=motion.git;a=commitdiff_plain;h=1aa987d0d2f2c0a82b5bc0bbfe89eb1646b297a7;hp=9294e72428970a7bcb670c651d036a6d26db6610

Merge branch 'UTC' into 'master'

Utc

See merge request felixdoerre/motion!5
---

diff --git a/templates/motion.html b/templates/motion.html
index eac27bd..b0fb70d 100644
--- a/templates/motion.html
+++ b/templates/motion.html
@@ -9,11 +9,11 @@
     <span class="motion-type">{{motion.type}}</span>
     <div># <a href="/motion/{{motion.identifier}}" class="anchor">{{motion.identifier}}</a></div>
     <div class="date">
-      <div>Posed: {{motion.posed|timestamp}} by {{motion.poser}}</div>
+      <div>Proposed: {{motion.posed|timestamp}} (UTC) by {{motion.poser}}</div>
 {%- if motion.canceled != None %}
-      <div>Canceled: {{motion.canceled|timestamp}} by {{motion.canceler}}</div></div>
+      <div>Canceled: {{motion.canceled|timestamp}} (UTC) by {{motion.canceler}}</div></div>
 {%- else %}
-      <div>Votes until: {{motion.deadline|timestamp}}</div></div>
+      <div>Votes until: {{motion.deadline|timestamp} (UTC)}</div></div>
 {%- endif %}
   </div>
   <div class="panel-body">