diff --git a/app/eventyay/base/models/event.py b/app/eventyay/base/models/event.py index 58d13bde06..ad43c4afa8 100644 --- a/app/eventyay/base/models/event.py +++ b/app/eventyay/base/models/event.py @@ -71,7 +71,6 @@ from .organizer import Organizer, OrganizerBillingModel, Team TALK_HOSTNAME = settings.TALK_HOSTNAME -LANGUAGE_NAMES = {code: name for code, name in settings.LANGUAGES} def event_css_path(instance, filename): return path_with_hash(filename, base_path=f"{instance.slug}/css/") @@ -2107,7 +2106,7 @@ def available_content_locales(self) -> list: # Content locales can be anything eventyay knows as a language, merged with # this event's plugin locales. - locale_names = dict(default_django_settings.LANGUAGES) + locale_names = dict(settings.LANGUAGES) locale_names.update(self.named_plugin_locales) return sorted([(key, value) for key, value in locale_names.items()]) @@ -2115,7 +2114,8 @@ def available_content_locales(self) -> list: def named_content_locales(self) -> list: locale_names = dict(self.available_content_locales) # locale_names['en-us'] = locale_names['en'] - return [(code, locale_names[code]) for code in self.content_locales] + locale_names |= LANGUAGE_NAMES + return [(code, locale_names.get(code, code)) for code in self.content_locales] @cached_property def named_plugin_locales(self) -> list: diff --git a/app/eventyay/orga/templates/orga/submission/list.html b/app/eventyay/orga/templates/orga/submission/list.html index c9c1e249dd..602b3582f7 100644 --- a/app/eventyay/orga/templates/orga/submission/list.html +++ b/app/eventyay/orga/templates/orga/submission/list.html @@ -94,7 +94,7 @@