Revised the smart_date filter in the Mia core application.

This commit is contained in:
依瑪貓 2021-01-17 00:37:34 +08:00
parent bb93f601ad
commit fd47f7bd94
2 changed files with 27 additions and 11 deletions

View File

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mia-core 3.0\n" "Project-Id-Version: mia-core 3.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-17 23:56+0800\n" "POT-Creation-Date: 2021-01-17 00:24+0800\n"
"PO-Revision-Date: 2020-08-18 00:02+0800\n" "PO-Revision-Date: 2021-01-17 00:29+0800\n"
"Last-Translator: imacat <imacat@mail.imacat.idv.tw>\n" "Last-Translator: imacat <imacat@mail.imacat.idv.tw>\n"
"Language-Team: Traditional Chinese <imacat@mail.imacat.idv.tw>\n" "Language-Team: Traditional Chinese <imacat@mail.imacat.idv.tw>\n"
"Language: Traditional Chinese\n" "Language: Traditional Chinese\n"
@ -38,13 +38,13 @@ msgstr "全部"
#: mia_core/period.py:588 mia_core/period.py:621 #: mia_core/period.py:588 mia_core/period.py:621
#: mia_core/templates/mia_core/include/period-chooser.html:60 #: mia_core/templates/mia_core/include/period-chooser.html:60
#: mia_core/templatetags/mia_core.py:173 #: mia_core/templatetags/mia_core.py:219
msgid "This Month" msgid "This Month"
msgstr "這個月" msgstr "這個月"
#: mia_core/period.py:629 #: mia_core/period.py:629
#: mia_core/templates/mia_core/include/period-chooser.html:63 #: mia_core/templates/mia_core/include/period-chooser.html:63
#: mia_core/templatetags/mia_core.py:180 #: mia_core/templatetags/mia_core.py:226
msgid "Last Month" msgid "Last Month"
msgstr "上個月" msgstr "上個月"
@ -60,13 +60,13 @@ msgstr "去年"
#: mia_core/period.py:661 #: mia_core/period.py:661
#: mia_core/templates/mia_core/include/period-chooser.html:95 #: mia_core/templates/mia_core/include/period-chooser.html:95
#: mia_core/templatetags/mia_core.py:153 #: mia_core/templatetags/mia_core.py:187
msgid "Today" msgid "Today"
msgstr "今天" msgstr "今天"
#: mia_core/period.py:663 #: mia_core/period.py:663
#: mia_core/templates/mia_core/include/period-chooser.html:98 #: mia_core/templates/mia_core/include/period-chooser.html:98
#: mia_core/templatetags/mia_core.py:155 #: mia_core/templatetags/mia_core.py:190
msgid "Yesterday" msgid "Yesterday"
msgstr "昨天" msgstr "昨天"
@ -115,17 +115,21 @@ msgstr "從:"
msgid "To:" msgid "To:"
msgstr "到:" msgstr "到:"
#: mia_core/utils.py:347 #: mia_core/templatetags/mia_core.py:192
msgid "Tomorrow"
msgstr "明天"
#: mia_core/utils.py:342
msgctxt "Pagination|" msgctxt "Pagination|"
msgid "Previous" msgid "Previous"
msgstr "上一頁" msgstr "上一頁"
#: mia_core/utils.py:375 mia_core/utils.py:396 #: mia_core/utils.py:370 mia_core/utils.py:391
msgctxt "Pagination|" msgctxt "Pagination|"
msgid "..." msgid "..."
msgstr "…" msgstr "…"
#: mia_core/utils.py:415 #: mia_core/utils.py:410
msgctxt "Pagination|" msgctxt "Pagination|"
msgid "Next" msgid "Next"
msgstr "下一頁" msgstr "下一頁"

View File

@ -30,7 +30,7 @@ from django.template import defaultfilters, RequestContext
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from django.utils.safestring import SafeString from django.utils.safestring import SafeString
from django.utils.translation import gettext from django.utils.translation import gettext, get_language
from mia_core.utils import UrlBuilder, CssAndJavaScriptLibraries from mia_core.utils import UrlBuilder, CssAndJavaScriptLibraries
@ -185,8 +185,20 @@ def smart_date(value: datetime.date) -> str:
""" """
if value == date.today(): if value == date.today():
return gettext("Today") return gettext("Today")
if (date.today() - value).days == 1: prev_days = (value - date.today()).days
if prev_days == -1:
return gettext("Yesterday") return gettext("Yesterday")
if prev_days == 1:
return gettext("Tomorrow")
if get_language() == "zh-hant":
if prev_days == -2:
return "前天"
if prev_days == -3:
return "大前天"
if prev_days == 2:
return "後天"
if prev_days == 3:
return "大後天"
if date.today().year == value.year: if date.today().year == value.year:
return defaultfilters.date(value, "n/j(D)").replace("星期", "") return defaultfilters.date(value, "n/j(D)").replace("星期", "")
return defaultfilters.date(value, "Y/n/j(D)").replace("星期", "") return defaultfilters.date(value, "Y/n/j(D)").replace("星期", "")