diff --git a/server.py b/server.py index 3949cbb9779f8938c7e5ec2393b5005de6b63695..77cc68788e686c219db21498349fee8ba401055b 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 f3807bf6b0dd4290126255342252c515c913b200..6492f4a2208cad78eb4ea2b63614b155a0a16729 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 d250c8290e8fd07d80a20446dc02511eb24670f5..84309ccda734aea167460ef22be145266828f78c 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}};