From 92f669ca8b05b282b363c183224cf21bcd4ac14f Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 30 Mar 2023 16:53:41 +0200 Subject: [PATCH] tools (common/template): let specify timezone name in `date_fmt` filter --- sat/tools/common/template.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sat/tools/common/template.py b/sat/tools/common/template.py index d8afb7ef..632e3ee0 100644 --- a/sat/tools/common/template.py +++ b/sat/tools/common/template.py @@ -761,14 +761,23 @@ class Renderer(object): current = ctx["gidx"].current(value) return value if not current else "{}_{}".format(value, current) - def _date_fmt(self, timestamp, fmt="short", date_only=False, auto_limit=7, - auto_old_fmt="short", auto_new_fmt="relative"): + def _date_fmt( + self, + timestamp: Union[int, float], + fmt: str = "short", + date_only: bool = False, + auto_limit: int = 7, + auto_old_fmt: str = "short", + auto_new_fmt: str = "relative", + tz_name: Optional[str] = None + ) -> str: if is_undefined(fmt): fmt = "short" try: return date_utils.date_fmt( timestamp, fmt, date_only, auto_limit, auto_old_fmt, - locale_str = self._locale_str + auto_new_fmt, locale_str = self._locale_str, + tz_info=tz_name or date_utils.TZ_UTC ) except Exception as e: log.warning(_("Can't parse date: {msg}").format(msg=e))