diff --git a/core/admin/mailu/__init__.py b/core/admin/mailu/__init__.py index e4024e47..b49bdd67 100644 --- a/core/admin/mailu/__init__.py +++ b/core/admin/mailu/__init__.py @@ -57,6 +57,11 @@ def create_app_from_config(config): config = app.config, ) + # Jinja filter + @app.template_filter() + def format_date(value): + return utils.flask_babel.format_date(value) if value else '' + # Import views from mailu import ui, internal, sso app.register_blueprint(ui.ui, url_prefix=app.config['WEB_ADMIN']) diff --git a/core/admin/mailu/ui/templates/domain/list.html b/core/admin/mailu/ui/templates/domain/list.html index 6f6bc467..61c09151 100644 --- a/core/admin/mailu/ui/templates/domain/list.html +++ b/core/admin/mailu/ui/templates/domain/list.html @@ -46,8 +46,8 @@ {{ domain.users | count }} / {{ '∞' if domain.max_users == -1 else domain.max_users }} {{ domain.aliases | count }} / {{ '∞' if domain.max_aliases == -1 else domain.max_aliases }} {{ domain.comment or '' }} - {{ domain.created_at }} - {{ domain.updated_at or '' }} + {{ domain.created_at | format_date }} + {{ domain.updated_at | format_date }} {%- endfor %} diff --git a/core/admin/mailu/utils.py b/core/admin/mailu/utils.py index 8ae028bf..024c487f 100644 --- a/core/admin/mailu/utils.py +++ b/core/admin/mailu/utils.py @@ -18,10 +18,9 @@ import secrets import time from multiprocessing import Value - from mailu import limiter - from flask import current_app as app + import flask import flask_login import flask_migrate diff --git a/core/admin/requirements-prod.txt b/core/admin/requirements-prod.txt index 4b629d5d..ccd2b83d 100644 --- a/core/admin/requirements-prod.txt +++ b/core/admin/requirements-prod.txt @@ -1,6 +1,6 @@ alembic==1.7.4 appdirs==1.4.4 -Babel==2.6.0 +Babel==2.9.1 bcrypt==3.2.0 blinker==1.4 CacheControl==0.12.6 @@ -18,7 +18,7 @@ dnspython==2.1.0 dominate==2.3.5 email-validator==1.1.3 Flask==1.0.2 -Flask-Babel==1.0.0 +Flask-Babel==2.0.0 Flask-Bootstrap==3.3.7.1 Flask-DebugToolbar==0.10.1 Flask-Limiter==1.0.1 @@ -53,7 +53,7 @@ pycparser==2.20 Pygments==2.10.0 pyOpenSSL==21.0.0 pyparsing==2.4.7 -pytz==2019.1 +pytz==2021.3 PyYAML==6.0 redis==3.5.3 requests==2.25.1