Skip to content
Snippets Groups Projects
Commit 3b1cb9e6 authored by Administrator's avatar Administrator
Browse files

Do not write 'Uhr' for times in the template

parent bc2581e2
Branches
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ import math ...@@ -20,7 +20,7 @@ import math
import mimetypes import mimetypes
import config 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 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 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 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 ...@@ -51,6 +51,7 @@ app.jinja_env.lstrip_blocks = True
app.jinja_env.filters["datify"] = date_filter app.jinja_env.filters["datify"] = date_filter
app.jinja_env.filters["datetimify"] = datetime_filter app.jinja_env.filters["datetimify"] = datetime_filter
app.jinja_env.filters["timify"] = time_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_short"] = date_filter_short
app.jinja_env.filters["datify_long"] = date_filter_long app.jinja_env.filters["datify_long"] = date_filter_long
app.jinja_env.filters["url_complete"] = url_manager.complete app.jinja_env.filters["url_complete"] = url_manager.complete
......
...@@ -75,6 +75,8 @@ def date_filter_short(date): ...@@ -75,6 +75,8 @@ def date_filter_short(date):
return date.strftime("%d.%m.%Y") return date.strftime("%d.%m.%Y")
def time_filter(time): def time_filter(time):
return time.strftime("%H:%M Uhr") return time.strftime("%H:%M Uhr")
def time_filter_short(time):
return time.strftime("%H:%M")
def needs_date_test(todostate): def needs_date_test(todostate):
return todostate.needs_date() return todostate.needs_date()
......
#Datum;{{protocol.date|datify_short}} #Datum;{{protocol.date|datify_short}}
#Beginn;{{protocol.protocoltype.usual_time|timify}} #Beginn;{{protocol.protocoltype.usual_time|timify_short}}
#Ende; #Ende;
{% for defaultmeta in protocol.protocoltype.metas %} {% for defaultmeta in protocol.protocoltype.metas %}
#{{defaultmeta.key}}; #{{defaultmeta.key}};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment