From d42a2744d0bdeeac5c8eba3eaf4f9db02781f910 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Tue, 22 Nov 2022 19:19:11 +0100 Subject: [PATCH] lower_thirds: always use event locale when localizing text --- .../templates/pretalx_broadcast_tools/orga.html | 6 +++--- pretalx_broadcast_tools/views.py | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/orga.html b/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/orga.html index 470f722..cb20693 100644 --- a/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/orga.html +++ b/pretalx_broadcast_tools/templates/pretalx_broadcast_tools/orga.html @@ -18,11 +18,11 @@ hide itself.

- {% if request.event.rooms %} + {% if localized_rooms %}

{% trans "room list" %}

{% endif %} diff --git a/pretalx_broadcast_tools/views.py b/pretalx_broadcast_tools/views.py index 2e9e236..9838333 100644 --- a/pretalx_broadcast_tools/views.py +++ b/pretalx_broadcast_tools/views.py @@ -24,6 +24,14 @@ class BroadcastToolsOrgaView(PermissionRequired, FormView): def get_success_url(self): return self.request.path + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['localized_rooms'] = [ + room.name.localize(self.request.event.locale) + for room in self.request.event.rooms.all() + ] + return context + def form_valid(self, form): form.save() return super().form_valid(form) @@ -73,7 +81,7 @@ class BroadcastToolsScheduleView(EventPermissionRequired, ScheduleMixin, Templat { "rooms": sorted( { - str(room["name"]) + room["name"].localize(schedule.event.locale) for day in schedule.data for room in day["rooms"] } @@ -99,7 +107,7 @@ class BroadcastToolsScheduleView(EventPermissionRequired, ScheduleMixin, Templat } if talk.submission.track else None, - "room": str(room["name"]), + "room": room["name"].localize(schedule.event.locale), "infoline": infoline.format(**placeholders(schedule, talk)), } for day in schedule.data