Merge pull request pycontw#1116 from pycontw/update/2023-cfp

Update/2023 cfp

src/core/models.py

@@ -116,17 +116,15 @@ class EventInfo(models.Model):
  LANGUAGE_CHOICES = (
  ('ENEN', _('English talk')),
  ('ZHEN', _('Chinese talk w. English slides')),
+ ('ZHZH', _('Chinese talk w. Chinese slides')),
+ ('TAI', _('Taiwanese Hokkien')),
  )
  language = models.CharField(
  verbose_name=_('language'),
  max_length=5,
  choices=LANGUAGE_CHOICES,
  )
 
- talk_language = models.CharField(
- verbose_name=_('Talk language'),
- max_length=32,
- )
 
  abstract = EAWTextField(
  verbose_name=_('abstract'),
@@ -242,6 +240,7 @@ def get_language_tag(self):
  'ENEN': 'E',
  'ZHEN': 'ZE',
  'ZHZH': 'Z',
+ 'TAI': 'T',
  }[self.language]
 
  def get_python_level_tag(self):

src/events/migrations/0047_alter_language_choices_remove_talk_language.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.1.7 on 2023-02-08 10:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('events', '0046_alter_prefer_time'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='sponsoredevent',
+ name='talk_language',
+ ),
+ migrations.AlterField(
+ model_name='sponsoredevent',
+ name='language',
+ field=models.CharField(choices=[('ENEN', 'English talk'), ('ZHEN', 'Chinese talk w. English slides'), ('ZHZH', 'Chinese talk w. Chinese slides'), ('TAI', 'Taiwanese Hokkien')], max_length=5, verbose_name='language'),
+ ),
+ ]

src/locale/en_US/LC_MESSAGES/django.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PyCon TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-19 22:59+0800\n"
+"POT-Creation-Date: 2023-02-08 17:53+0800\n"
 "PO-Revision-Date: 2022-07-11 02:23+0800\n"
 "Last-Translator: Tom Chen <[email protected]>\n"
 "Language-Team: English (United States) (http:https://www.transifex.com/pycon-"
@@ -33,7 +33,7 @@ msgstr "token"
 msgid "verified"
 msgstr "verified"
 
-#: attendee/models.py:9 core/models.py:201 events/models.py:469
+#: attendee/models.py:9 core/models.py:199 events/models.py:469
 msgid "created at"
 msgstr "created at"
 
@@ -202,125 +202,129 @@ msgstr "English talk"
 msgid "Chinese talk w. English slides"
 msgstr "Chinese talk w. English slides"
 
-#: core/models.py:121
+#: core/models.py:119
+msgid "Chinese talk w. Chinese slides"
+msgstr "Chinese talk w. Chinese slides"
+
+#: core/models.py:120
+msgid "Taiwanese Hokkien"
+msgstr "Taiwanese Hokkien"
+
+#: core/models.py:123
 msgid "language"
 msgstr "language"
 
-#: core/models.py:127
-msgid "Talk language"
-msgstr "Talk language"
-
-#: core/models.py:132
+#: core/models.py:130
 msgid "abstract"
 msgstr "abstract"
 
-#: core/models.py:137
+#: core/models.py:135
 #: templates/default/_includes/proposal_example_modal.html:43
 #: templates/pycontw-2018/events/schedule.html:28
 #: templates/pycontw-2019/events/schedule.html:28
 msgid "Novice"
 msgstr "Novice"
 
-#: core/models.py:138
+#: core/models.py:136
 #: templates/default/_includes/proposal_example_modal.html:58
 #: templates/pycontw-2018/events/schedule.html:29
 #: templates/pycontw-2019/events/schedule.html:29
 msgid "Intermediate"
 msgstr "Intermediate"
 
-#: core/models.py:139 templates/pycontw-2018/events/schedule.html:30
+#: core/models.py:137 templates/pycontw-2018/events/schedule.html:30
 #: templates/pycontw-2019/events/schedule.html:30
 msgid "Experienced"
 msgstr "Experienced"
 
-#: core/models.py:142 templates/default/reviews/review_form.html:53
+#: core/models.py:140 templates/default/reviews/review_form.html:53
 msgid "Python level"
 msgstr "Python level"
 
-#: core/models.py:148
+#: core/models.py:146
 msgid "detailed description"
 msgstr "detailed description"
 
-#: core/models.py:153 core/models.py:163 core/models.py:173 core/models.py:224
+#: core/models.py:151 core/models.py:161 core/models.py:171 core/models.py:222
 #: proposals/models.py:268 reviews/models.py:122 reviews/models.py:137
 msgid "Yes"
 msgstr "Yes"
 
-#: core/models.py:154 core/models.py:164 core/models.py:174 core/models.py:225
+#: core/models.py:152 core/models.py:162 core/models.py:172 core/models.py:223
 #: proposals/models.py:269 reviews/models.py:123 reviews/models.py:138
 msgid "No"
 msgstr "No"
 
-#: core/models.py:157
+#: core/models.py:155
 msgid "recording policy"
 msgstr "recording release"
 
-#: core/models.py:167
+#: core/models.py:165
 msgid "live stream policy"
 msgstr "live stream policy"
 
-#: core/models.py:177
+#: core/models.py:175
 msgid "referring policy"
 msgstr "referral policy"
 
-#: core/models.py:183
+#: core/models.py:181
 msgid "slide link"
 msgstr "slide link"
 
-#: core/models.py:189
+#: core/models.py:187
 msgid "slido embed link"
 msgstr "Slido embed link"
 
-#: core/models.py:195 events/models.py:258
+#: core/models.py:193 events/models.py:258
 msgid "HackMD embed link"
 msgstr "HackMD embed link"
 
-#: core/models.py:207
+#: core/models.py:205
 msgid "last updated at"
 msgstr "last updated at"
 
-#: core/models.py:212
+#: core/models.py:210
 msgid "Day 1, September 2nd, 2023 Morning"
 msgstr "Day 1, September 2nd, 2023 Morning with Taiwan Standard Time(UTC+8)"
 
-#: core/models.py:213
+#: core/models.py:211
 msgid "Day 1, September 2nd, 2023 Afternoon"
 msgstr "Day 1, September 2nd, 2023 Afternoon with Taiwan Standard Time(UTC+8)"
 
-#: core/models.py:214
+#: core/models.py:212
 msgid "Day 2, September 3rd, 2023 Morning"
 msgstr "Day 2, September 3rd, 2023 Morning with Taiwan Standard Time(UTC+8)"
 
-#: core/models.py:215
+#: core/models.py:213
 msgid "Day 2, September 3rd, 2023 Afternoon"
 msgstr "Day 2, September 3rd, 2023 Afternoon with Taiwan Standard Time(UTC+8)"
 
-#: core/models.py:218
+#: core/models.py:216
 msgid "prefer event time"
 msgstr "prefer event time"
 
-#: core/models.py:228
+#: core/models.py:226
 msgid "living in Taiwan"
 msgstr "living in Taiwan"
 
-#: core/models.py:259 reviews/admin.py:51
+#: core/models.py:258 reviews/admin.py:51
 msgid "Key"
 msgstr "Key"
 
-#: core/models.py:263 proposals/models.py:62 users/models.py:198
+#: core/models.py:262 proposals/models.py:62 users/models.py:198
 #: users/models.py:313
 msgid "user"
 msgstr "user"
 
-#: core/models.py:266
+#: core/models.py:265
 msgid "Created"
 msgstr "created at"
 
-#: core/models.py:269
+#: core/models.py:268
 msgid "Token"
 msgstr ""
 
-#: core/models.py:270
+#: core/models.py:269
 msgid "Tokens"
 msgstr ""
 
@@ -735,8 +739,7 @@ msgid ""
 "proposal to your local PyCon community if your proposal did not get accepted."
 msgstr ""
 "Whether you agree to give permission to PyCon Taiwan to refer your talk "
-"proposal to your local PyCon community if your proposal did not get "
-"accepted."
+"proposal to your local PyCon community if your proposal did not get accepted."
 
 #: proposals/forms/mixins.py:97
 msgid ""