From 4711b3bc1931e38fae814738b2ac72ef6970ab35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Mon, 1 Jan 2024 18:29:00 +0100 Subject: [PATCH] naturalday_partial: simplify/refactor --- bookwyrm/templatetags/date_ext.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/bookwyrm/templatetags/date_ext.py b/bookwyrm/templatetags/date_ext.py index bdad92f4c..efe55f2d9 100644 --- a/bookwyrm/templatetags/date_ext.py +++ b/bookwyrm/templatetags/date_ext.py @@ -15,18 +15,10 @@ def naturalday_partial(date, arg=None): If arg is a Django-defined format such as "DATE_FORMAT", it will be adjusted so that the precision of the PartialDate object is honored. """ - django_formats = ("DATE_FORMAT", "SHORT_DATE_FORMAT", "YEAR_MONTH_FORMAT") - if not isinstance(date, PartialDate): + if not isinstance(date, PartialDate) or date.has_day: return naturalday(date, arg) - if arg is None: - arg = "DATE_FORMAT" - if date.has_day: - fmt = arg - elif date.has_month: - # there is no SHORT_YEAR_MONTH_FORMAT, so we ignore SHORT_DATE_FORMAT :( - fmt = "YEAR_MONTH_FORMAT" if arg == "DATE_FORMAT" else arg - else: - fmt = "Y" if arg in django_formats else arg - if date.has_day: - return naturalday(date, fmt) - return defaultfilters.date(date, fmt) + if not arg or arg == "DATE_FORMAT": + arg = "YEAR_MONTH_FORMAT" if date.has_month else "Y" + elif not date.has_month and arg in ("SHORT_DATE_FORMAT", "YEAR_MONTH_FORMAT"): + arg = "Y" + return defaultfilters.date(date, arg)