From ad122464f32fcf1dc1ba20f577629c679798cfb4 Mon Sep 17 00:00:00 2001 From: Ernesto Rico Schmidt <ernesto@helsinki.at> Date: Tue, 25 Jun 2024 16:21:28 -0400 Subject: [PATCH] =?UTF-8?q?feat:=20naming=20things=20is=20hard=E2=84=A2?= =?UTF-8?q?=EF=B8=8F:=20use=20program=20instead=20of=20programme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- program/admin.py | 2 +- program/serializers.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/program/admin.py b/program/admin.py index 0d100b1d..63e295d6 100644 --- a/program/admin.py +++ b/program/admin.py @@ -119,7 +119,7 @@ class RadioSettingsAdmin(admin.ModelAdmin): ] }, ), - ("Programme", {"fields": [("fallback_show", "fallback_default_pool"), "micro_show"]}), + ("Program", {"fields": [("fallback_show", "fallback_default_pool"), "micro_show"]}), ("CBA", {"fields": ["cba_api_key", "cba_domains"]}), ("Playout", {"fields": ["line_in_channels", "fallback_pools"]}), ] diff --git a/program/serializers.py b/program/serializers.py index 116810e4..b134f6bd 100644 --- a/program/serializers.py +++ b/program/serializers.py @@ -1187,18 +1187,18 @@ class RadioCBASettings(TypedDict): domains: list[str] -class ProgrammeFallback(TypedDict): +class ProgramFallback(TypedDict): default_pool: str show_id: int | None -class MicroProgramme(TypedDict): +class MicroProgram(TypedDict): show_id: int | None -class RadioProgrammeSettings(TypedDict): - fallback: ProgrammeFallback - micro: MicroProgramme +class RadioProgramSettings(TypedDict): + fallback: ProgramFallback + micro: MicroProgram class PlayoutPools(TypedDict): @@ -1241,7 +1241,7 @@ class RadioSettingsSerializer(serializers.ModelSerializer): cba = serializers.SerializerMethodField() image_requirements = serializers.SerializerMethodField() playout = serializers.SerializerMethodField() - programme = serializers.SerializerMethodField() + program = serializers.SerializerMethodField() station = serializers.SerializerMethodField() class Meta: @@ -1250,7 +1250,7 @@ class RadioSettingsSerializer(serializers.ModelSerializer): "cba", "image_requirements", "playout", - "programme", + "program", "station", ) model = RadioSettings @@ -1311,7 +1311,7 @@ class RadioSettingsSerializer(serializers.ModelSerializer): } @staticmethod - def get_programme(obj) -> RadioProgrammeSettings: + def get_program(obj) -> RadioProgramSettings: return { "micro": {"show_id": obj.micro_show.id if obj.micro_show else None}, "fallback": { -- GitLab