Skip to content

feat: update location display names #1258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tyuchx merged 2 commits into from
Aug 20, 2025
Merged

feat: update location display names #1258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
971ee13
feat: update room location choices from R012 to R0_ALL
tyuchx Aug 18, 2025
0d689a6
feat(i18n): complete empty msgstr entries in translation files
tyuchx Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions src/events/migrations/0056_auto_20250819_0214.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Generated by Django 3.2.25 on 2025-08-18 18:14

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('events', '0055_auto_20250707_2327'),
]

operations = [
migrations.AlterField(
model_name='customevent',
name='location',
field=models.CharField(blank=True, choices=[('2-all', 'All rooms'), ('3-r0-all', 'R0 (Simulcast)'), ('4-r0', 'R0'), ('5-r1', 'R1'), ('6-r2', 'R2'), ('1-r3', 'R3'), ('7-r4', 'R4'), ('81-spt-os', 'Sprint / Open Space'), ('82-tutorial', 'Tutorial'), ('83-yi-ps', 'Young Inspire / Poster Session')], db_index=True, max_length=12, null=True, verbose_name='location'),
),
migrations.AlterField(
model_name='joblistingsevent',
name='location',
field=models.CharField(blank=True, choices=[('2-all', 'All rooms'), ('3-r0-all', 'R0 (Simulcast)'), ('4-r0', 'R0'), ('5-r1', 'R1'), ('6-r2', 'R2'), ('1-r3', 'R3'), ('7-r4', 'R4'), ('81-spt-os', 'Sprint / Open Space'), ('82-tutorial', 'Tutorial'), ('83-yi-ps', 'Young Inspire / Poster Session')], db_index=True, max_length=12, null=True, verbose_name='location'),
),
migrations.AlterField(
model_name='keynoteevent',
name='location',
field=models.CharField(blank=True, choices=[('2-all', 'All rooms'), ('3-r0-all', 'R0 (Simulcast)'), ('4-r0', 'R0'), ('5-r1', 'R1'), ('6-r2', 'R2'), ('1-r3', 'R3'), ('7-r4', 'R4'), ('81-spt-os', 'Sprint / Open Space'), ('82-tutorial', 'Tutorial'), ('83-yi-ps', 'Young Inspire / Poster Session')], db_index=True, max_length=12, null=True, verbose_name='location'),
),
migrations.AlterField(
model_name='proposedtalkevent',
name='location',
field=models.CharField(blank=True, choices=[('2-all', 'All rooms'), ('3-r0-all', 'R0 (Simulcast)'), ('4-r0', 'R0'), ('5-r1', 'R1'), ('6-r2', 'R2'), ('1-r3', 'R3'), ('7-r4', 'R4'), ('81-spt-os', 'Sprint / Open Space'), ('82-tutorial', 'Tutorial'), ('83-yi-ps', 'Young Inspire / Poster Session')], db_index=True, max_length=12, null=True, verbose_name='location'),
),
migrations.AlterField(
model_name='proposedtutorialevent',
name='location',
field=models.CharField(blank=True, choices=[('2-all', 'All rooms'), ('3-r0-all', 'R0 (Simulcast)'), ('4-r0', 'R0'), ('5-r1', 'R1'), ('6-r2', 'R2'), ('1-r3', 'R3'), ('7-r4', 'R4'), ('81-spt-os', 'Sprint / Open Space'), ('82-tutorial', 'Tutorial'), ('83-yi-ps', 'Young Inspire / Poster Session')], db_index=True, max_length=12, null=True, verbose_name='location'),
),
migrations.AlterField(
model_name='sponsoredevent',
name='location',
field=models.CharField(blank=True, choices=[('2-all', 'All rooms'), ('3-r0-all', 'R0 (Simulcast)'), ('4-r0', 'R0'), ('5-r1', 'R1'), ('6-r2', 'R2'), ('1-r3', 'R3'), ('7-r4', 'R4'), ('81-spt-os', 'Sprint / Open Space'), ('82-tutorial', 'Tutorial'), ('83-yi-ps', 'Young Inspire / Poster Session')], db_index=True, max_length=12, null=True, verbose_name='location'),
),
]
6 changes: 3 additions & 3 deletions src/events/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class Location:
"""
R3 = '1-r3'
ALL = '2-all'
R012 = '3-r012'
R0_ALL = '3-r0-all'
R0 = '4-r0'
R0_1 = '4-r0-1'
R0_2 = '4-r0-2'
Expand All @@ -125,8 +125,8 @@ class BaseEvent(ConferenceRelated):
"""Base interface for all events in the schedule.
"""
LOCATION_CHOICES = [
# (Location.ALL, _('All rooms')),
# (Location.R012, _('R0, R1, R2')),
(Location.ALL, _('All rooms')),
(Location.R0_ALL, _('R0 (Simulcast)')),
(Location.R0, _('R0')),
# (Location.R0_1, _('R0_1')),
# (Location.R0_2, _('R0_2')),
Expand Down
168 changes: 85 additions & 83 deletions src/locale/en_US/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyCon TW\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-07-07 23:53+0800\n"
"POT-Creation-Date: 2025-08-19 02:15+0800\n"
"PO-Revision-Date: 2022-07-11 02:23+0800\n"
"Last-Translator: Tom Chen <ctchen@gmail.com>\n"
"Language-Team: English (United States) (http://www.transifex.com/pycon-"
Expand Down Expand Up @@ -343,6 +343,14 @@ msgstr "time"
msgid "times"
msgstr "times"

#: events/models.py:128
msgid "All rooms"
msgstr ""

#: events/models.py:129
msgid "R0 (Simulcast)"
msgstr ""

#: events/models.py:130
msgid "R0"
msgstr "R0"
Expand Down Expand Up @@ -1738,17 +1746,17 @@ msgid ""
"acceptance.<br/>Conversely, if the information in the field is insufficient "
"or empty, it will greatly reduce the chances of acceptance and may even "
"prevent your proposal from being reviewed.<br/><br/>Please review the <a "
"href=\"%(FRONTEND_HOST)s/%(LANGUAGE_CODE)s/speaking/talk\" "
"target=\"_blank\">How to Propose a Talk</a> page."
"href=\"%(FRONTEND_HOST)s/%(LANGUAGE_CODE)s/speaking/talk\" target=\"_blank"
"\">How to Propose a Talk</a> page."
msgstr ""
"Note that each field plays a crucial role in determining whether your "
"proposal is accepted. It is recommended that you provide as much detail as "
"possible in each field, which will greatly increase the chances of "
"acceptance.<br/>Conversely, if the information in the field is insufficient "
"or empty, it will greatly reduce the chances of acceptance and may even "
"prevent your proposal from being reviewed.<br/><br/>Please review the <a "
"href=\"%(FRONTEND_HOST)s/%(LANGUAGE_CODE)s/speaking/talk\" "
"target=\"_blank\">How to Propose a Talk</a> page."
"href=\"%(FRONTEND_HOST)s/%(LANGUAGE_CODE)s/speaking/talk\" target=\"_blank"
"\">How to Propose a Talk</a> page."

#: templates/default/_includes/tutorial_proposal_alert.html:6
#, python-format
Expand All @@ -1759,17 +1767,17 @@ msgid ""
"acceptance.<br/>Conversely, if the information in the field is insufficient "
"or empty, it will greatly reduce the chances of acceptance and may even "
"prevent your proposal from being reviewed.<br/><br/>Please review the <a "
"href=\"%(FRONTEND_HOST)s/%(LANGUAGE_CODE)s/speaking/tutorial\" "
"target=\"_blank\">How to Propose a Tutorial</a> page."
"href=\"%(FRONTEND_HOST)s/%(LANGUAGE_CODE)s/speaking/tutorial\" target="
"\"_blank\">How to Propose a Tutorial</a> page."
msgstr ""
"Note that each field plays a crucial role in determining whether your "
"proposal is accepted. It is recommended that you provide as much detail as "
"possible in each field, which will greatly increase the chances of "
"acceptance.<br/>Conversely, if the information in the field is insufficient "
"or empty, it will greatly reduce the chances of acceptance and may even "
"prevent your proposal from being reviewed.<br/><br/>Please review the <a "
"href=\"%(FRONTEND_HOST)s/%(LANGUAGE_CODE)s/speaking/tutorial\" "
"target=\"_blank\">How to Propose a Tutorial</a> page."
"href=\"%(FRONTEND_HOST)s/%(LANGUAGE_CODE)s/speaking/tutorial\" target="
"\"_blank\">How to Propose a Tutorial</a> page."

#: templates/default/dashboard_base.html:7
#: templates/pycontw-2016/_includes/nav/front_nav.html:82
Expand Down Expand Up @@ -1972,11 +1980,11 @@ msgstr "Sign Up"
#: templates/default/registration/signup.html:13
#, python-format
msgid ""
"<span class=\"form-tip\">Already have an account?</span> <a "
"href=\"%(login_url)s\" class=\"btn btn-link\">Login.</a>"
"<span class=\"form-tip\">Already have an account?</span> <a href="
"\"%(login_url)s\" class=\"btn btn-link\">Login.</a>"
msgstr ""
"<span class=\"form-tip\">Already have an account?</span> <a "
"href=\"%(login_url)s\" class=\"btn btn-link\">Login.</a>"
"<span class=\"form-tip\">Already have an account?</span> <a href="
"\"%(login_url)s\" class=\"btn btn-link\">Login.</a>"

#: templates/default/registration/verification_email.txt:6
#, python-format
Expand Down Expand Up @@ -2236,13 +2244,11 @@ msgstr "New Talk Porposal"
#: templates/default/users/user_dashboard.html:33
#, python-format
msgid ""
"You haven't submitted any talk proposals. Why not <a "
"href=\"%(talk_proposal_create_url)s\" class=\"dashboard-link\">submit one "
"now</a>?"
"You haven't submitted any talk proposals. Why not <a href="
"\"%(talk_proposal_create_url)s\" class=\"dashboard-link\">submit one now</a>?"
msgstr ""
"You haven't submitted any talk proposals. Why not <a "
"href=\"%(talk_proposal_create_url)s\" class=\"dashboard-link\">submit one "
"now</a>?"
"You haven't submitted any talk proposals. Why not <a href="
"\"%(talk_proposal_create_url)s\" class=\"dashboard-link\">submit one now</a>?"

#: templates/default/users/user_dashboard.html:35
msgid "You haven't submitted any talk proposals."
Expand All @@ -2259,13 +2265,13 @@ msgstr "New Tutorial Porposal"
#: templates/default/users/user_dashboard.html:58
#, python-format
msgid ""
"You haven't submitted any tutorial proposals. Why not <a "
"href=\"%(tutorial_proposal_create_url)s\" class=\"dashboard-link\">submit "
"one now</a>?"
"You haven't submitted any tutorial proposals. Why not <a href="
"\"%(tutorial_proposal_create_url)s\" class=\"dashboard-link\">submit one "
"now</a>?"
msgstr ""
"You haven't submitted any tutorial proposals. Why not <a "
"href=\"%(tutorial_proposal_create_url)s\" class=\"dashboard-link\">submit "
"one now</a>?"
"You haven't submitted any tutorial proposals. Why not <a href="
"\"%(tutorial_proposal_create_url)s\" class=\"dashboard-link\">submit one "
"now</a>?"

#: templates/default/users/user_dashboard.html:60
msgid "You haven't submitted any tutorial proposals."
Expand Down Expand Up @@ -2654,15 +2660,15 @@ msgstr "Blog"
msgid ""
"This is the full schedule of talks for PyCon Taiwan 2016. See also: <ul> "
"<li><a href=\"%(overview_url)s\">Overview of conference schedule</a></li> "
"<li><a href=\"%(keynote_url)s\">Our keynote speeches</a></li> <li><a "
"href=\"%(talk_list_url)s\">An alphabetically-sorted list of all talks</a></"
"li> </ul>"
"<li><a href=\"%(keynote_url)s\">Our keynote speeches</a></li> <li><a href="
"\"%(talk_list_url)s\">An alphabetically-sorted list of all talks</a></li> </"
"ul>"
msgstr ""
"This is the full schedule of talks for PyCon Taiwan 2016. See also: <ul> "
"<li><a href=\"%(overview_url)s\">Overview of conference schedule</a></li> "
"<li><a href=\"%(keynote_url)s\">Our keynote speeches</a></li> <li><a "
"href=\"%(talk_list_url)s\">An alphabetically-sorted list of all talks</a></"
"li> </ul>"
"<li><a href=\"%(keynote_url)s\">Our keynote speeches</a></li> <li><a href="
"\"%(talk_list_url)s\">An alphabetically-sorted list of all talks</a></li> </"
"ul>"

#: templates/pycontw-2016/events/schedule.html:32
#: templates/pycontw-2016/events/talk_list.html:20
Expand Down Expand Up @@ -2723,11 +2729,11 @@ msgstr "Description"
#: templates/pycontw-2016/events/talk_list.html:14
#, python-format
msgid ""
"You can check out the program schedule <a class=\"text-emphasize\" "
"href=\"%(schedule_url)s\">here</a>."
"You can check out the program schedule <a class=\"text-emphasize\" href="
"\"%(schedule_url)s\">here</a>."
msgstr ""
"You can check out the program schedule <a class=\"text-emphasize\" "
"href=\"%(schedule_url)s\">here</a>."
"You can check out the program schedule <a class=\"text-emphasize\" href="
"\"%(schedule_url)s\">here</a>."

#: templates/pycontw-2016/events/talk_list.html:28
#: templates/pycontw-2017/events/talk_list.html:33
Expand All @@ -2738,13 +2744,11 @@ msgstr "Proposed Talks"
#: templates/pycontw-2017/events/talk_list.html:41
#, python-format
msgid ""
"<a class=\"proposal-title\" "
"href=\"%(event_talk_detail_url)s\">%(proposal_title)s</a> by "
"%(speaker_names)s"
"<a class=\"proposal-title\" href=\"%(event_talk_detail_url)s\">"
"%(proposal_title)s</a> by %(speaker_names)s"
msgstr ""
"<a class=\"proposal-title\" "
"href=\"%(event_talk_detail_url)s\">%(proposal_title)s</a> by "
"%(speaker_names)s"
"<a class=\"proposal-title\" href=\"%(event_talk_detail_url)s\">"
"%(proposal_title)s</a> by %(speaker_names)s"

#: templates/pycontw-2016/events/talk_list.html:38
msgid "Sponsored Events"
Expand All @@ -2754,11 +2758,11 @@ msgstr "Sponsored Events"
#: templates/pycontw-2017/events/talk_list.html:53
#, python-format
msgid ""
"<a class=\"proposal-title\" "
"href=\"%(sponsored_event_url)s\">%(event_title)s</a> by %(host_name)s"
"<a class=\"proposal-title\" href=\"%(sponsored_event_url)s\">"
"%(event_title)s</a> by %(host_name)s"
msgstr ""
"<a class=\"proposal-title\" "
"href=\"%(sponsored_event_url)s\">%(event_title)s</a> by %(host_name)s"
"<a class=\"proposal-title\" href=\"%(sponsored_event_url)s\">"
"%(event_title)s</a> by %(host_name)s"

#: templates/pycontw-2016/index.html:7
msgid ""
Expand Down Expand Up @@ -2853,21 +2857,21 @@ msgstr ""

#: templates/pycontw-2016/index.html:86
msgid ""
"<h2 class=\"intro__heading\">And what is PyCon Taiwan</h2> <div "
"class=\"intro__body\"> PyCon Taiwan is an annual convention in Taiwan for "
"the discussion and promotion of the Python programming language. It is held "
"by enthusiasts and focuses on Python technology and its versatile "
"applications. We welcome people who are interested in Python to join PyCon "
"Taiwan to share knowledge, exchange ideas, make connections and to help us "
"grow our network. </div>"
"<h2 class=\"intro__heading\">And what is PyCon Taiwan</h2> <div class="
"\"intro__body\"> PyCon Taiwan is an annual convention in Taiwan for the "
"discussion and promotion of the Python programming language. It is held by "
"enthusiasts and focuses on Python technology and its versatile applications. "
"We welcome people who are interested in Python to join PyCon Taiwan to share "
"knowledge, exchange ideas, make connections and to help us grow our network. "
"</div>"
msgstr ""
"<h2 class=\"intro__heading\">And what is PyCon Taiwan</h2> <div "
"class=\"intro__body\"> PyCon Taiwan is an annual convention in Taiwan for "
"the discussion and promotion of the Python programming language. It is held "
"by enthusiasts and focuses on Python technology and its versatile "
"applications. We welcome people who are interested in Python to join PyCon "
"Taiwan to share knowledge, exchange ideas, make connections and to help us "
"grow our network. </div>"
"<h2 class=\"intro__heading\">And what is PyCon Taiwan</h2> <div class="
"\"intro__body\"> PyCon Taiwan is an annual convention in Taiwan for the "
"discussion and promotion of the Python programming language. It is held by "
"enthusiasts and focuses on Python technology and its versatile applications. "
"We welcome people who are interested in Python to join PyCon Taiwan to share "
"knowledge, exchange ideas, make connections and to help us grow our network. "
"</div>"

#: templates/pycontw-2016/index.html:102
#, python-format
Expand All @@ -2876,15 +2880,15 @@ msgid ""
"height=\"22\" src=\"%(img_call_icon)s\" class=\"call__icon\"> </h4> <div "
"class=\"volunteer__body\"> <p>Help us organize and make the conference "
"successful!</p> <p> Please fill out<br> <a href=\"https://docs.google.com/"
"forms/d/1zwc4khAW18myt6dJ_s_YtJOfQEobgz8KhcySKL0HXl4/viewform\" "
"target=\"_blank\" rel=\"noopener\">our volunteer form</a> </p> </div>"
"forms/d/1zwc4khAW18myt6dJ_s_YtJOfQEobgz8KhcySKL0HXl4/viewform\" target="
"\"_blank\" rel=\"noopener\">our volunteer form</a> </p> </div>"
msgstr ""
"<h4 class=\"volunteer__heading h4\"> Volunteers Needed! <img width=\"25\" "
"height=\"22\" src=\"%(img_call_icon)s\" class=\"call__icon\"> </h4> <div "
"class=\"volunteer__body\"> <p>Help us organize and make the conference "
"successful!</p> <p> Please fill out<br> <a href=\"https://docs.google.com/"
"forms/d/1zwc4khAW18myt6dJ_s_YtJOfQEobgz8KhcySKL0HXl4/viewform\" "
"target=\"_blank\" rel=\"noopener\">our volunteer form</a> </p> </div>"
"forms/d/1zwc4khAW18myt6dJ_s_YtJOfQEobgz8KhcySKL0HXl4/viewform\" target="
"\"_blank\" rel=\"noopener\">our volunteer form</a> </p> </div>"

#: templates/pycontw-2016/index.html:132
msgid "Python Community in Taiwan"
Expand Down Expand Up @@ -2930,11 +2934,11 @@ msgstr ""
#: templates/pycontw-2016/registration/signup.html:25
#, python-format
msgid ""
"<span class=\"form-tip\">Already have an account?</span><a "
"href=\"%(login_url)s\" class=\"btn btn-link\">Login.</a>"
"<span class=\"form-tip\">Already have an account?</span><a href="
"\"%(login_url)s\" class=\"btn btn-link\">Login.</a>"
msgstr ""
"<span class=\"form-tip\">Already have an account?</span><a "
"href=\"%(login_url)s\" class=\"btn btn-link\">Login.</a>"
"<span class=\"form-tip\">Already have an account?</span><a href="
"\"%(login_url)s\" class=\"btn btn-link\">Login.</a>"

#: templates/pycontw-2017/_includes/header.html:48
msgid "about"
Expand Down Expand Up @@ -3221,11 +3225,11 @@ msgstr "Volunteers Needed"
#: templates/pycontw-2017/index.html:40
#, python-format
msgid ""
"Help us organize and make the conference successful! Please fill out <a "
"href=\"%(VOLUNTEER_FORM_URL)s\">our volunteer form.</a>"
"Help us organize and make the conference successful! Please fill out <a href="
"\"%(VOLUNTEER_FORM_URL)s\">our volunteer form.</a>"
msgstr ""
"Help us organize and make the conference successful! Please fill out <a "
"href=\"%(VOLUNTEER_FORM_URL)s\">our volunteer form.</a>"
"Help us organize and make the conference successful! Please fill out <a href="
"\"%(VOLUNTEER_FORM_URL)s\">our volunteer form.</a>"

#: templates/pycontw-2017/index.html:45
msgid ""
Expand Down Expand Up @@ -3623,13 +3627,11 @@ msgstr ""
#: templates/pycontw-2019/events/talk_list.html:34
#, python-format
msgid ""
"<a class=\"talk-title\" "
"href=\"%(event_talk_detail_url)s\">%(proposal_title)s</a> by "
"%(speaker_names)s"
"<a class=\"talk-title\" href=\"%(event_talk_detail_url)s\">"
"%(proposal_title)s</a> by %(speaker_names)s"
msgstr ""
"<a class=\"talk-title\" "
"href=\"%(event_talk_detail_url)s\">%(proposal_title)s</a> by "
"%(speaker_names)s"
"<a class=\"talk-title\" href=\"%(event_talk_detail_url)s\">"
"%(proposal_title)s</a> by %(speaker_names)s"

#: templates/pycontw-2018/index.html:32 templates/pycontw-2019/index.html:39
#: templates/pycontw-2020/index.html:60 templates/pycontw-2021/index.html:63
Expand Down Expand Up @@ -4484,14 +4486,14 @@ msgstr ""
#: templates/pycontw-2025/_includes/ext/discord.html:123
msgid ""
"3.Join the Python Taiwan Discord server. <br>Python Taiwan Discord server "
"invite link: <a href='https://discord.gg/94hgCQv'>https://discord.gg/"
"94hgCQv</a> <br>In your Discord client App, click the button with plus sign, "
"and then select 'Join a server'."
"invite link: <a href='https://discord.gg/94hgCQv'>https://discord."
"gg/94hgCQv</a> <br>In your Discord client App, click the button with plus "
"sign, and then select 'Join a server'."
msgstr ""
"3.Join the Python Taiwan Discord server. <br>Python Taiwan Discord server "
"invite link: <a href='https://discord.gg/94hgCQv'>https://discord.gg/"
"94hgCQv</a> <br>In your Discord client App, click the button with plus sign, "
"and then select 'Join a server'."
"invite link: <a href='https://discord.gg/94hgCQv'>https://discord."
"gg/94hgCQv</a> <br>In your Discord client App, click the button with plus "
"sign, and then select 'Join a server'."

#: templates/pycontw-2020/_includes/ext/discord.html:126
#: templates/pycontw-2021/_includes/ext/discord.html:126
Expand Down
Loading