Skip to content

Commit

Permalink
refactor(proposals/forms.py): Update text
Browse files Browse the repository at this point in the history
  • Loading branch information
setmao committed Feb 27, 2022
1 parent f42c6a4 commit a8c02b7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 19 deletions.
15 changes: 7 additions & 8 deletions src/core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,11 @@ class EventInfo(models.Model):

LANGUAGE_CHOICES = (
('ENEN', _('English talk')),
('ZHEN', _('Chinese talk w. English slides')),
('ZHZH', _('Chinese talk w. Chinese slides')),
('NONEN', _('non-English talk w. English slides')),
)
language = models.CharField(
verbose_name=_('language'),
max_length=4,
max_length=5,
choices=LANGUAGE_CHOICES,
)

Expand Down Expand Up @@ -210,10 +209,10 @@ class EventInfo(models.Model):
)

PERFER_TIME_CHOICES = (
('DAY_ONE_MORNING', _('Day 1 morning')),
('DAY_ONE_AFTERNOON', _('Day 1 afternoon')),
('DAY_TWO_MORNING', _('Day 2 morning')),
('DAY_TWO_AFTERNOON', _('Day 2 afternoon')),
('DAY_ONE_MORNING', _('Day 1, September 3rd, 2022 Morning')),
('DAY_ONE_AFTERNOON', _('Day 1, September 3rd, 2022 Afternoon')),
('DAY_TWO_MORNING', _('Day 2, September 4th, 2022 Morning')),
('DAY_TWO_AFTERNOON', _('Day 2, September 4th, 2022 Afternoon')),
)
prefer_time = models.CharField(
verbose_name=_('prefer event time'),
Expand All @@ -226,7 +225,7 @@ class EventInfo(models.Model):
(False, _('No'))
)
living_in_taiwan = models.BooleanField(
verbose_name=_('living in taiwan'),
verbose_name=_('living in Taiwan'),
default=False,
choices=REFERRING_POLICY_CHOICES,
)
Expand Down
23 changes: 13 additions & 10 deletions src/proposals/forms/mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ class Meta:
"day. Not required for review."
),
'referring_policy': _(
"Whether you agree to give permission to PyCon Taiwan to "
"refer your talk proposal to local communities if your "
"proposal did not get accepted."
"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(APAC only)."
),
'objective': _(
"<p><a href='#' data-toggle='modal' "
Expand Down Expand Up @@ -128,18 +128,21 @@ class Meta:
"audio and video of your presentation)"
),
'first_time_speaker': _(
"Is it your first time to be the speaker of PyCon TW?"
"Have you ever been a speaker at PyCon Taiwan in the past?"

),
'pre_recorded_policy': _(
"Due to the ongoing global pandemic, <strong>PyCon APAC 2022 will "
"be held fully remote. All online talks will be pre-recorded "
"</strong> since we can broadcast your presentation to the audience "
"be held fully remote. All online talks this year will be pre-recorded "
"</strong> so we can broadcast your presentation to the audience "
"without the network troubles and the time zone differences.<br>"
"Please record your presentation and send us your presentation video "
"once your proposal got accepted. Also, if you live in Taiwan, we will "
"provide you with a video studio in Taipei to help you with recording "
"your presentation video."
"After your proposal is accepted, a pre-recording of the presentation "
"will be provided to the PyCon APAC 2022 organizing team prior to the "
"conference.<br>"
"<strong>Bonus for living in Taiwan</strong>"
"For speakers who reside in Taiwan, we will offer a slot and assist you "
"to record the presentation in a professional video studio in Taipei "
"(travel expenses covered)."
)
}

Expand Down
2 changes: 1 addition & 1 deletion src/proposals/forms/proposals.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ class Meta(TalkProposalMixin.Meta):
'first_time_speaker',
'referring_policy',
'prefer_time',
'living_in_taiwan',
'pre_recorded_policy',
'living_in_taiwan',
]


Expand Down

0 comments on commit a8c02b7

Please sign in to comment.