From 3b1cb9e67185521462dbb5bafbc5b98ec7b55d02 Mon Sep 17 00:00:00 2001
From: FSMPI Admin-Team <admin@fsmpi.rwth-aachen.de>
Date: Thu, 9 Mar 2017 22:31:12 +0100
Subject: [PATCH] Do not write 'Uhr' for times in the template
---
server.py | 3 ++-
shared.py | 2 ++
templates/protocol-template.txt | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server.py b/server.py
index 3949cbb..77cc687 100755
--- a/server.py
+++ b/server.py
@@ -20,7 +20,7 @@ import math
import mimetypes
import config
-from shared import db, date_filter, datetime_filter, date_filter_long, date_filter_short, time_filter, ldap_manager, security_manager, current_user, check_login, login_required, group_required, class_filter, needs_date_test, todostate_name_filter, code_filter, indent_tab_filter
+from shared import db, date_filter, datetime_filter, date_filter_long, date_filter_short, time_filter, time_filter_short, ldap_manager, security_manager, current_user, check_login, login_required, group_required, class_filter, needs_date_test, todostate_name_filter, code_filter, indent_tab_filter
from utils import is_past, mail_manager, url_manager, get_first_unused_int, set_etherpad_text, get_etherpad_text, split_terms, optional_int_arg
from decorators import db_lookup, require_public_view_right, require_private_view_right, require_modify_right, require_admin_right
from models.database import ProtocolType, Protocol, DefaultTOP, TOP, Document, Todo, Decision, MeetingReminder, Error, TodoMail, DecisionDocument, TodoState, Meta, DefaultMeta
@@ -51,6 +51,7 @@ app.jinja_env.lstrip_blocks = True
app.jinja_env.filters["datify"] = date_filter
app.jinja_env.filters["datetimify"] = datetime_filter
app.jinja_env.filters["timify"] = time_filter
+app.jinja_env.filters["timify_short"] = time_filter_short
app.jinja_env.filters["datify_short"] = date_filter_short
app.jinja_env.filters["datify_long"] = date_filter_long
app.jinja_env.filters["url_complete"] = url_manager.complete
diff --git a/shared.py b/shared.py
index f3807bf..6492f4a 100644
--- a/shared.py
+++ b/shared.py
@@ -75,6 +75,8 @@ def date_filter_short(date):
return date.strftime("%d.%m.%Y")
def time_filter(time):
return time.strftime("%H:%M Uhr")
+def time_filter_short(time):
+ return time.strftime("%H:%M")
def needs_date_test(todostate):
return todostate.needs_date()
diff --git a/templates/protocol-template.txt b/templates/protocol-template.txt
index d250c82..84309cc 100644
--- a/templates/protocol-template.txt
+++ b/templates/protocol-template.txt
@@ -1,5 +1,5 @@
#Datum;{{protocol.date|datify_short}}
-#Beginn;{{protocol.protocoltype.usual_time|timify}}
+#Beginn;{{protocol.protocoltype.usual_time|timify_short}}
#Ende;
{% for defaultmeta in protocol.protocoltype.metas %}
#{{defaultmeta.key}};
--
GitLab