Skip to content

Commit 7d18be1

Browse files
Remove .localize() calls on conference.name after CharField conversion
- Replace conference.name.localize(language_code) with direct conference.name usage - Updated 25 instances across 11 files in backend codebase - Conference name is now a regular CharField, no longer needs localization Co-authored-by: Marco Acierno <[email protected]>
1 parent 51ef299 commit 7d18be1

File tree

12 files changed

+25
-25
lines changed

12 files changed

+25
-25
lines changed

backend/grants/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def _new_send_grant_email(
157157
):
158158
conference = grant.conference
159159
user = grant.user
160-
conference_name = grant.conference.name.localize("en")
160+
conference_name = grant.conference.name
161161

162162
email_template = EmailTemplate.objects.for_conference(conference).get_by_identifier(
163163
template_identifier

backend/grants/tests/test_tasks.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_send_grant_reply_rejected_email():
3333
recipient=user,
3434
placeholders={
3535
"user_name": "Marco Acierno",
36-
"conference_name": grant.conference.name.localize("en"),
36+
"conference_name": grant.conference.name,
3737
},
3838
)
3939

@@ -67,7 +67,7 @@ def test_send_grant_reply_waiting_list_email(settings):
6767
recipient=user,
6868
placeholders={
6969
"user_name": "Marco Acierno",
70-
"conference_name": grant.conference.name.localize("en"),
70+
"conference_name": grant.conference.name,
7171
"grants_update_deadline": "1 March 2023",
7272
"reply_url": "https://pycon.it/grants/reply/",
7373
},
@@ -101,7 +101,7 @@ def test_handle_grant_reply_sent_reminder(settings):
101101
recipient=user,
102102
placeholders={
103103
"user_name": "Marco Acierno",
104-
"conference_name": grant.conference.name.localize("en"),
104+
"conference_name": grant.conference.name,
105105
"start_date": "2 May",
106106
"end_date": "6 May",
107107
"deadline_date_time": "1 February 2023 23:59 UTC",
@@ -144,7 +144,7 @@ def test_handle_grant_approved_ticket_travel_accommodation_reply_sent(settings):
144144
recipient=user,
145145
placeholders={
146146
"user_name": "Marco Acierno",
147-
"conference_name": grant.conference.name.localize("en"),
147+
"conference_name": grant.conference.name,
148148
"start_date": "2 May",
149149
"end_date": "6 May",
150150
"travel_amount": "680",
@@ -218,7 +218,7 @@ def test_handle_grant_approved_ticket_only_reply_sent(settings):
218218
recipient=user,
219219
placeholders={
220220
"user_name": "Marco Acierno",
221-
"conference_name": grant.conference.name.localize("en"),
221+
"conference_name": grant.conference.name,
222222
"start_date": "2 May",
223223
"end_date": "6 May",
224224
"deadline_date_time": "1 February 2023 23:59 UTC",
@@ -262,7 +262,7 @@ def test_handle_grant_approved_travel_reply_sent(settings):
262262
recipient=user,
263263
placeholders={
264264
"user_name": "Marco Acierno",
265-
"conference_name": grant.conference.name.localize("en"),
265+
"conference_name": grant.conference.name,
266266
"start_date": "2 May",
267267
"end_date": "6 May",
268268
"deadline_date_time": "1 February 2023 23:59 UTC",
@@ -295,7 +295,7 @@ def test_send_grant_reply_waiting_list_update_email(settings):
295295
"it": "Update Grants in Waiting List",
296296
},
297297
)
298-
conference_name = grant.conference.name.localize("en")
298+
conference_name = grant.conference.name
299299

300300
with patch("grants.tasks.EmailTemplate") as mock_email_template:
301301
send_grant_reply_waiting_list_update_email(

backend/schedule/tasks.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def send_schedule_invitation_email(*, schedule_item_id, is_reminder):
4444
submission_title = submission.title.localize(language_code)
4545

4646
speaker = User.objects.get(id=speaker_id)
47-
conference_name = conference.name.localize("en")
47+
conference_name = conference.name
4848

4949
email_template = EmailTemplate.objects.for_conference(conference).get_by_identifier(
5050
EmailTemplateIdentifier.proposal_scheduled
@@ -81,7 +81,7 @@ def send_submission_time_slot_changed_email(*, schedule_item_id):
8181

8282
proposal_speaker = User.objects.get(id=speaker_id)
8383
conference = schedule_item.conference
84-
conference_name = schedule_item.conference.name.localize("en")
84+
conference_name = schedule_item.conference.name
8585

8686
email_template = EmailTemplate.objects.for_conference(conference).get_by_identifier(
8787
EmailTemplateIdentifier.proposal_scheduled_time_changed
@@ -188,7 +188,7 @@ def send_speaker_communication_email(
188188
email_template.send_email(
189189
recipient=user,
190190
placeholders={
191-
"conference_name": conference.name.localize("en"),
191+
"conference_name": conference.name,
192192
"user_name": get_name(user, "there"),
193193
"body": body.replace("\n", "<br />"),
194194
"subject": subject,

backend/schedule/tests/test_tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def test_send_speaker_communication_email_to_speakers_without_ticket(
224224
recipient=user,
225225
placeholders={
226226
"user_name": "Marco Acierno",
227-
"conference_name": conference.name.localize("en"),
227+
"conference_name": conference.name,
228228
"body": "test body",
229229
"subject": "test subject",
230230
},
@@ -265,7 +265,7 @@ def test_send_speaker_communication_email_to_everyone(
265265
placeholders={
266266
"user_name": "Marco Acierno",
267267
"body": "test body",
268-
"conference_name": conference.name.localize("en"),
268+
"conference_name": conference.name,
269269
"subject": "test subject",
270270
},
271271
)

backend/schedule/tests/test_views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def test_user_schedule_item_favourites_calendar(client):
130130
calendar = icalendar.Calendar.from_ical(response.content)
131131
assert (
132132
calendar.get("x-wr-calname")
133-
== f"Your {conference.name.localize('en')}'s Schedule"
133+
== f"Your {conference.name}'s Schedule"
134134
)
135135

136136
assert len(calendar.subcomponents) == 2
@@ -148,7 +148,7 @@ def test_user_schedule_item_favourites_calendar(client):
148148

149149
assert (
150150
event_schedule_item_1.get("summary")
151-
== f"[{conference.name.localize('en')}] {schedule_item_1.title}"
151+
== f"[{conference.name}] {schedule_item_1.title}"
152152
)
153153
assert event_schedule_item_1.get("location") == "Room Name"
154154
assert (

backend/schedule/video_upload.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def create_video_info(schedule_item: ScheduleItem) -> VideoInfo:
4040
"abstract": schedule_item.abstract,
4141
"slug": schedule_item.slug,
4242
"elevator_pitch": schedule_item.elevator_pitch,
43-
"conference_name": schedule_item.conference.name.localize("en"),
43+
"conference_name": schedule_item.conference.name,
4444
"hashtags": " ".join([f"#{tag}" for tag in tags]),
4545
}
4646

backend/schedule/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def user_schedule_item_favourites_calendar(request, conference_id, hash_user_id)
2929
.values_list("schedule_item_id", flat=True)
3030
)
3131

32-
conference_name = conference.name.localize("en")
32+
conference_name = conference.name
3333
conference_code = conference.code
3434
conference_timezone = conference.timezone
3535

backend/sponsors/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def send_sponsor_brochure(sponsor_lead_id):
2424
recipient_email=sponsor_lead.email,
2525
placeholders={
2626
"brochure_url": brochure_url,
27-
"conference_name": conference.name.localize("en"),
27+
"conference_name": conference.name,
2828
},
2929
)
3030

backend/sponsors/tests/test_tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test_send_sponsor_brochure_task():
2323
recipient_email=sponsor_lead.email,
2424
placeholders={
2525
"brochure_url": f"https://admin.pycon.it{view_brochure_path}?sig={signature}",
26-
"conference_name": sponsor_lead.conference.name.localize("en"),
26+
"conference_name": sponsor_lead.conference.name,
2727
},
2828
)
2929

backend/submissions/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def apply_and_notify_status_change(modeladmin, request, queryset):
357357
for submission in objs:
358358
submission.status = submission.pending_status
359359
placeholders = {
360-
"conference_name": conference.name.localize("en"),
360+
"conference_name": conference.name,
361361
"proposal_title": submission.title.localize("en"),
362362
"proposal_type": submission.type.name,
363363
"speaker_name": get_name(submission.speaker, "there"),

0 commit comments

Comments
 (0)