From b674918d2840c00d684922fada53514edb54a7fa Mon Sep 17 00:00:00 2001 From: svyeh Date: Mon, 19 Feb 2024 13:23:45 +0800 Subject: [PATCH 1/3] adjust_conference_date_to_2024 update date in 2023 to 2024 --- src/core/choices.py | 8 ++++---- src/locale/en_US/LC_MESSAGES/django.po | 16 ++++++++-------- src/pycontw2016/settings/base.py | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core/choices.py b/src/core/choices.py index 9fa3e11da..4a3b5db37 100644 --- a/src/core/choices.py +++ b/src/core/choices.py @@ -38,10 +38,10 @@ ) PREFER_TIME_CHOICES = ( - ('DAY_ONE_MORNING', _('Day 1, September 2nd, 2023 Morning')), - ('DAY_ONE_AFTERNOON', _('Day 1, September 2nd, 2023 Afternoon')), - ('DAY_TWO_MORNING', _('Day 2, September 3rd, 2023 Morning')), - ('DAY_TWO_AFTERNOON', _('Day 2, September 3rd, 2023 Afternoon')), + ('DAY_ONE_MORNING', _('Day 1, September 21th, 2024 Morning')), + ('DAY_ONE_AFTERNOON', _('Day 1, September 21th, 2024 Afternoon')), + ('DAY_TWO_MORNING', _('Day 2, September 22th, 2024 Morning')), + ('DAY_TWO_AFTERNOON', _('Day 2, September 22th, 2024 Afternoon')), ) RECORDING_POLICY_CHOICES = ( diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index 2096ee077..6504b580b 100644 --- a/src/locale/en_US/LC_MESSAGES/django.po +++ b/src/locale/en_US/LC_MESSAGES/django.po @@ -214,20 +214,20 @@ msgid "Experienced" msgstr "Experienced" #: core/choices.py:41 -msgid "Day 1, September 2nd, 2023 Morning" -msgstr "Day 1, September 2nd, 2023 Morning with Taiwan Standard Time(UTC+8)" +msgid "Day 1, September 21th, 2024 Morning" +msgstr "Day 1, September 21th, 2024 Morning with Taiwan Standard Time(UTC+8)" #: core/choices.py:42 -msgid "Day 1, September 2nd, 2023 Afternoon" -msgstr "Day 1, September 2nd, 2023 Afternoon with Taiwan Standard Time(UTC+8)" +msgid "Day 1, September 21th, 2024 Afternoon" +msgstr "Day 1, September 21th, 2024 Afternoon with Taiwan Standard Time(UTC+8)" #: core/choices.py:43 -msgid "Day 2, September 3rd, 2023 Morning" -msgstr "Day 2, September 3rd, 2023 Morning with Taiwan Standard Time(UTC+8)" +msgid "Day 2, September 22th, 2024 Morning" +msgstr "Day 2, September 22th, 2024 Morning with Taiwan Standard Time(UTC+8)" #: core/choices.py:44 -msgid "Day 2, September 3rd, 2023 Afternoon" -msgstr "Day 2, September 3rd, 2023 Afternoon with Taiwan Standard Time(UTC+8)" +msgid "Day 2, September 22th, 2024 Afternoon" +msgstr "Day 2, September 22th, 2024 Afternoon with Taiwan Standard Time(UTC+8)" #: core/choices.py:48 core/choices.py:53 core/choices.py:58 core/choices.py:63 #: core/choices.py:68 reviews/models.py:122 reviews/models.py:137 diff --git a/src/pycontw2016/settings/base.py b/src/pycontw2016/settings/base.py index 4db8c9c43..e79b5a58d 100644 --- a/src/pycontw2016/settings/base.py +++ b/src/pycontw2016/settings/base.py @@ -325,8 +325,8 @@ def node_bin(name): ) EVENTS_DAY_NAMES = collections.OrderedDict([ - (datetime.date(2024, 9, 2), _('Day 1')), - (datetime.date(2024, 9, 3), _('Day 2')), + (datetime.date(2024, 9, 21), _('Day 1')), + (datetime.date(2024, 9, 22), _('Day 2')), ]) SCHEDULE_REDIRECT_URL = None From a280a4f0f016305566b119f783ecf5664bf88f60 Mon Sep 17 00:00:00 2001 From: svyeh Date: Wed, 21 Feb 2024 00:14:09 +0800 Subject: [PATCH 2/3] Update django.po --- src/locale/zh_Hant/LC_MESSAGES/django.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/locale/zh_Hant/LC_MESSAGES/django.po b/src/locale/zh_Hant/LC_MESSAGES/django.po index 43f4f6e24..fb6a70ede 100644 --- a/src/locale/zh_Hant/LC_MESSAGES/django.po +++ b/src/locale/zh_Hant/LC_MESSAGES/django.po @@ -221,20 +221,20 @@ msgid "Experienced" msgstr "進階" #: core/choices.py:41 -msgid "Day 1, September 2nd, 2023 Morning" -msgstr "第一天(2023/09/02)早上" +msgid "Day 1, September 21st, 2024 Morning" +msgstr "第一天(2024/09/21)早上" #: core/choices.py:42 -msgid "Day 1, September 2nd, 2023 Afternoon" -msgstr "第一天(2023/09/02)下午" +msgid "Day 1, September 21st, 2024 Afternoon" +msgstr "第一天(2024/09/21)下午" #: core/choices.py:43 -msgid "Day 2, September 3rd, 2023 Morning" -msgstr "第二天(2023/09/03)早上" +msgid "Day 2, September 22nd, 2024 Morning" +msgstr "第二天(2024/09/22)早上" #: core/choices.py:44 -msgid "Day 2, September 3rd, 2023 Afternoon" -msgstr "第二天(2023/09/03)下午" +msgid "Day 2, September 22nd, 2024 Afternoon" +msgstr "第二天(2024/09/22)下午" #: core/choices.py:48 core/choices.py:53 core/choices.py:58 core/choices.py:63 #: core/choices.py:68 reviews/models.py:122 reviews/models.py:137 From d09ca2425d4a14ea534cc1e2e3c30f377a819aea Mon Sep 17 00:00:00 2001 From: svyeh Date: Wed, 21 Feb 2024 12:29:28 +0800 Subject: [PATCH 3/3] fix typo --- src/core/choices.py | 8 ++++---- src/locale/en_US/LC_MESSAGES/django.po | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/choices.py b/src/core/choices.py index 4a3b5db37..07574c178 100644 --- a/src/core/choices.py +++ b/src/core/choices.py @@ -38,10 +38,10 @@ ) PREFER_TIME_CHOICES = ( - ('DAY_ONE_MORNING', _('Day 1, September 21th, 2024 Morning')), - ('DAY_ONE_AFTERNOON', _('Day 1, September 21th, 2024 Afternoon')), - ('DAY_TWO_MORNING', _('Day 2, September 22th, 2024 Morning')), - ('DAY_TWO_AFTERNOON', _('Day 2, September 22th, 2024 Afternoon')), + ('DAY_ONE_MORNING', _('Day 1, September 21st, 2024 Morning')), + ('DAY_ONE_AFTERNOON', _('Day 1, September 21st, 2024 Afternoon')), + ('DAY_TWO_MORNING', _('Day 2, September 22nd, 2024 Morning')), + ('DAY_TWO_AFTERNOON', _('Day 2, September 22nd, 2024 Afternoon')), ) RECORDING_POLICY_CHOICES = ( diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index 6504b580b..1710dd138 100644 --- a/src/locale/en_US/LC_MESSAGES/django.po +++ b/src/locale/en_US/LC_MESSAGES/django.po @@ -214,20 +214,20 @@ msgid "Experienced" msgstr "Experienced" #: core/choices.py:41 -msgid "Day 1, September 21th, 2024 Morning" -msgstr "Day 1, September 21th, 2024 Morning with Taiwan Standard Time(UTC+8)" +msgid "Day 1, September 21st, 2024 Morning" +msgstr "Day 1, September 21st, 2024 Morning with Taiwan Standard Time(UTC+8)" #: core/choices.py:42 -msgid "Day 1, September 21th, 2024 Afternoon" -msgstr "Day 1, September 21th, 2024 Afternoon with Taiwan Standard Time(UTC+8)" +msgid "Day 1, September 21st, 2024 Afternoon" +msgstr "Day 1, September 21st, 2024 Afternoon with Taiwan Standard Time(UTC+8)" #: core/choices.py:43 -msgid "Day 2, September 22th, 2024 Morning" -msgstr "Day 2, September 22th, 2024 Morning with Taiwan Standard Time(UTC+8)" +msgid "Day 2, September 22nd, 2024 Morning" +msgstr "Day 2, September 22nd, 2024 Morning with Taiwan Standard Time(UTC+8)" #: core/choices.py:44 -msgid "Day 2, September 22th, 2024 Afternoon" -msgstr "Day 2, September 22th, 2024 Afternoon with Taiwan Standard Time(UTC+8)" +msgid "Day 2, September 22nd, 2024 Afternoon" +msgstr "Day 2, September 22nd, 2024 Afternoon with Taiwan Standard Time(UTC+8)" #: core/choices.py:48 core/choices.py:53 core/choices.py:58 core/choices.py:63 #: core/choices.py:68 reviews/models.py:122 reviews/models.py:137