Skip to content

Commit

Permalink
Merge pull request pycontw#1097 from mattwang44/add-special-thanks
Browse files Browse the repository at this point in the history
feat(sponsor): add choice for special thanks list
  • Loading branch information
mattwang44 committed Aug 24, 2022
2 parents d28b60c + 59cccf2 commit d8d1975
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 48 deletions.
50 changes: 27 additions & 23 deletions src/locale/en_US/LC_MESSAGES/django.po
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: 2022-07-24 23:14+0800\n"
"POT-Creation-Date: 2022-08-23 01:42+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-"
Expand Down Expand Up @@ -49,32 +49,32 @@ msgstr "attendee"
msgid "attendees"
msgstr "attendees"

#: ccip/views.py:206
#: ccip/views.py:204
msgctxt "CCIP event type"
msgid "event"
msgstr "event"

#: ccip/views.py:214
#: ccip/views.py:212
msgctxt "CCIP event type"
msgid "break"
msgstr "break"

#: ccip/views.py:222
#: ccip/views.py:220
msgctxt "CCIP event type"
msgid "keynote"
msgstr "keynote"

#: ccip/views.py:228
#: ccip/views.py:226
msgctxt "CCIP event type"
msgid "sponsored"
msgstr "sponsored"

#: ccip/views.py:236
#: ccip/views.py:234
msgctxt "CCIP event type"
msgid "tutorial"
msgstr "tutorial"

#: ccip/views.py:248
#: ccip/views.py:246
msgctxt "CCIP event type"
msgid "talk"
msgstr "talk"
Expand Down Expand Up @@ -509,7 +509,7 @@ msgstr "keynote events"
msgid "Keynote: {speaker}"
msgstr "Keynote: {speaker}"

#: events/models.py:325 sponsors/models.py:99 sponsors/models.py:115
#: events/models.py:325 sponsors/models.py:101 sponsors/models.py:117
msgid "sponsor"
msgstr "sponsor"

Expand Down Expand Up @@ -1530,63 +1530,67 @@ msgstr ""
msgid "order"
msgstr "order"

#: sponsors/models.py:79
#: sponsors/models.py:80
msgid "platinum"
msgstr "platinum"

#: sponsors/models.py:80
#: sponsors/models.py:81
msgid "gold"
msgstr "gold"

#: sponsors/models.py:81
#: sponsors/models.py:82
msgid "silver"
msgstr "silver"

#: sponsors/models.py:82
#: sponsors/models.py:83
msgid "bronze"
msgstr "bronze"

#: sponsors/models.py:83
#: sponsors/models.py:84
msgid "special"
msgstr "special"

#: sponsors/models.py:84
#: sponsors/models.py:85
msgid "special-thanks"
msgstr "special-thanks"

#: sponsors/models.py:86
msgid "organizer"
msgstr "organizer"

#: sponsors/models.py:85
#: sponsors/models.py:87
msgid "co-organizer"
msgstr "co-organizer"

#: sponsors/models.py:94
#: sponsors/models.py:96
msgid "level"
msgstr "level"

#: sponsors/models.py:100
#: sponsors/models.py:102
msgid "sponsors"
msgstr "sponsors"

#: sponsors/models.py:120
#: sponsors/models.py:122
msgid "open role name"
msgstr "open role name"

#: sponsors/models.py:125
#: sponsors/models.py:127
msgid "open role descsription"
msgstr "open role description"

#: sponsors/models.py:129
#: sponsors/models.py:131
msgid "open role requirements"
msgstr "open role requirements"

#: sponsors/models.py:134
#: sponsors/models.py:136
msgid "open role URL"
msgstr "open role URL"

#: sponsors/models.py:139
#: sponsors/models.py:141
msgid "open role"
msgstr "open role"

#: sponsors/models.py:140
#: sponsors/models.py:142
msgid "open Roles"
msgstr "open Roles"

Expand Down
50 changes: 27 additions & 23 deletions src/locale/zh_Hant/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyCon TW\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-24 23:16+0800\n"
"POT-Creation-Date: 2022-08-23 01:42+0800\n"
"PO-Revision-Date: 2022-07-11 02:25+0800\n"
"Last-Translator: Tom Chen <[email protected]>\n"
"Language-Team: Chinese Traditional (http:https://www.transifex.com/pycon-taiwan/"
Expand Down Expand Up @@ -56,32 +56,32 @@ msgstr "會眾"
msgid "attendees"
msgstr "會眾"

#: ccip/views.py:206
#: ccip/views.py:204
msgctxt "CCIP event type"
msgid "event"
msgstr "活動"

#: ccip/views.py:214
#: ccip/views.py:212
msgctxt "CCIP event type"
msgid "break"
msgstr "休息"

#: ccip/views.py:222
#: ccip/views.py:220
msgctxt "CCIP event type"
msgid "keynote"
msgstr "基調演講"

#: ccip/views.py:228
#: ccip/views.py:226
msgctxt "CCIP event type"
msgid "sponsored"
msgstr "贊助"

#: ccip/views.py:236
#: ccip/views.py:234
msgctxt "CCIP event type"
msgid "tutorial"
msgstr "專業課程"

#: ccip/views.py:248
#: ccip/views.py:246
msgctxt "CCIP event type"
msgid "talk"
msgstr "演講"
Expand Down Expand Up @@ -516,7 +516,7 @@ msgstr "基調演講"
msgid "Keynote: {speaker}"
msgstr "基調演講:{speaker}"

#: events/models.py:325 sponsors/models.py:99 sponsors/models.py:115
#: events/models.py:325 sponsors/models.py:101 sponsors/models.py:117
msgid "sponsor"
msgstr "贊助"

Expand Down Expand Up @@ -1480,63 +1480,67 @@ msgstr ""
msgid "order"
msgstr "排序"

#: sponsors/models.py:79
#: sponsors/models.py:80
msgid "platinum"
msgstr "白金級"

#: sponsors/models.py:80
#: sponsors/models.py:81
msgid "gold"
msgstr "金級"

#: sponsors/models.py:81
#: sponsors/models.py:82
msgid "silver"
msgstr "銀級"

#: sponsors/models.py:82
#: sponsors/models.py:83
msgid "bronze"
msgstr "銅級"

#: sponsors/models.py:83
#: sponsors/models.py:84
msgid "special"
msgstr "特別贊助"

#: sponsors/models.py:84
#: sponsors/models.py:85
msgid "special-thanks"
msgstr "特別感謝"

#: sponsors/models.py:86
msgid "organizer"
msgstr "主辦單位"

#: sponsors/models.py:85
#: sponsors/models.py:87
msgid "co-organizer"
msgstr "協辦單位"

#: sponsors/models.py:94
#: sponsors/models.py:96
msgid "level"
msgstr "等級"

#: sponsors/models.py:100
#: sponsors/models.py:102
msgid "sponsors"
msgstr "贊助"

#: sponsors/models.py:120
#: sponsors/models.py:122
msgid "open role name"
msgstr "職缺名稱"

#: sponsors/models.py:125
#: sponsors/models.py:127
msgid "open role descsription"
msgstr "職缺說明"

#: sponsors/models.py:129
#: sponsors/models.py:131
msgid "open role requirements"
msgstr "職缺需求"

#: sponsors/models.py:134
#: sponsors/models.py:136
msgid "open role URL"
msgstr "職缺 URL"

#: sponsors/models.py:139
#: sponsors/models.py:141
msgid "open role"
msgstr "職缺"

#: sponsors/models.py:140
#: sponsors/models.py:142
msgid "open Roles"
msgstr "職缺"

Expand Down
18 changes: 18 additions & 0 deletions src/sponsors/migrations/0029_add_special_thanks_choice.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.1.7 on 2022-08-22 17:40

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('sponsors', '0028_sponsor_order'),
]

operations = [
migrations.AlterField(
model_name='sponsor',
name='level',
field=models.SmallIntegerField(choices=[(1, 'platinum'), (2, 'gold'), (3, 'silver'), (4, 'bronze'), (5, 'special'), (6, 'special-thanks'), (7, 'organizer'), (8, 'co-organizer')], verbose_name='level'),
),
]
6 changes: 4 additions & 2 deletions src/sponsors/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ class Level:
SILVER = 3
BRONZE = 4
SPECIAL = 5
ORGANIZER = 6
COORGANIZER = 7
SPECIAL_THANKS = 6
ORGANIZER = 7
COORGANIZER = 8

# Backward compatibility.
PARTNER = COORGANIZER
Expand All @@ -81,6 +82,7 @@ class Level:
(Level.SILVER, _('silver')),
(Level.BRONZE, _('bronze')),
(Level.SPECIAL, _('special')),
(Level.SPECIAL_THANKS, _('special-thanks')),
(Level.ORGANIZER, _('organizer')),
(Level.COORGANIZER, _('co-organizer')),
)
Expand Down

0 comments on commit d8d1975

Please sign in to comment.