diff --git a/gallery/easel/route/view/common/utils/template.py b/gallery/easel/route/view/common/utils/template.py index dd846bd..c12f377 100644 --- a/gallery/easel/route/view/common/utils/template.py +++ b/gallery/easel/route/view/common/utils/template.py @@ -1,3 +1,4 @@ +import datetime from pathlib import Path from babel.dates import format_date @@ -7,6 +8,7 @@ from fastapi.templating import Jinja2Templates from gallery.version import __version__ from ...translation import _ +from .tag import TagUtil def is_widget(request: Request) -> bool: @@ -31,6 +33,9 @@ def build_templates(templates_dir: Path | None = None, filters: dict | None = No "_": _, "version": __version__, "format_date": format_date, + "datetime": datetime, + "tag_util": TagUtil, + "DATE_FORMAT": "E, d MMMM Y", } ) if filters: diff --git a/gallery/easel/route/view/weather/__init__.py b/gallery/easel/route/view/weather/__init__.py index df09178..fbff432 100644 --- a/gallery/easel/route/view/weather/__init__.py +++ b/gallery/easel/route/view/weather/__init__.py @@ -25,8 +25,6 @@ def build_weather_response(request: AppRequest, response: WeatherResponse): request=request, name="weather.html", context={ - "tag_util": TagUtil, - "datetime": datetime, "response": response, }, ) diff --git a/gallery/easel/route/view/weather/filters.py b/gallery/easel/route/view/weather/filters.py index c42318b..77bb247 100644 --- a/gallery/easel/route/view/weather/filters.py +++ b/gallery/easel/route/view/weather/filters.py @@ -1,6 +1,12 @@ import datetime -from gallery.sketch.weather.model import Cloudness, Precipitation, Sky, WindDirection, WindDirectionDeg +from gallery.sketch.weather.model import ( + Cloudness, + Precipitation, + Sky, + WindDirection, + WindDirectionDeg, +) def wind_direction_icon(wind_direction_deg: float) -> str: @@ -8,7 +14,7 @@ def wind_direction_icon(wind_direction_deg: float) -> str: if wind_direction == WindDirection.CALM: return "wind-calm" else: - return f"wind-from-{wind_direction.name.lower()}" + return f"wind-from-{wind_direction.name.lower()}" def cloudness_icon(sky: Sky, date: datetime.datetime, period: str) -> list[str]: diff --git a/gallery/easel/route/view/weather/templates/weather.html b/gallery/easel/route/view/weather/templates/weather.html index d8dc714..3922e0a 100644 --- a/gallery/easel/route/view/weather/templates/weather.html +++ b/gallery/easel/route/view/weather/templates/weather.html @@ -9,16 +9,24 @@ {% block content %}