diff --git a/cogs/settings.py b/cogs/settings.py index 2be80b5..46939fc 100644 --- a/cogs/settings.py +++ b/cogs/settings.py @@ -142,7 +142,7 @@ class Settings(commands.Cog, name="settings"): dj_role = ctx.guild.get_role(settings.get('dj', 0)) embed.add_field(name=texts[1], value=texts[2].format( settings.get('prefix', voicelink.Config().bot_prefix) or 'None', - settings.get('lang', 'EN'), + settings.get('lang', LangHandler._default_lang), settings.get('controller', True), dj_role.name if dj_role else 'None', settings.get('common.status.disabled_vote', False), diff --git a/voicelink/language.py b/voicelink/language.py index deb8029..5115ebe 100644 --- a/voicelink/language.py +++ b/voicelink/language.py @@ -40,6 +40,7 @@ class LangHandler: _langs: dict[str, dict[str, str]] = {} _local_langs: dict[str, dict[str, str]] = {} + _default_lang: str = "EN" @classmethod def init( @@ -118,9 +119,12 @@ class LangHandler: Returns: str | list[str] | None: The requested string(s), or "Not found!" if missing. """ + if not lang: + lang = cls._default_lang + lang = lang.upper() if lang not in cls._langs: - lang = "EN" + lang = cls._default_lang lang_dict = cls._langs.get(lang, {}) if len(keys) == 1: @@ -144,7 +148,7 @@ class LangHandler: str | list[str] | None: The requested string(s). """ settings = await MongoDBHandler.get_settings(guild_id) - lang = settings.get("lang", "EN") + lang = settings.get("lang", LangHandler._default_lang) return cls._get_lang(lang, *keys) @classmethod diff --git a/voicelink/views/pagination.py b/voicelink/views/pagination.py index 16742b2..3d131fd 100644 --- a/voicelink/views/pagination.py +++ b/voicelink/views/pagination.py @@ -35,7 +35,7 @@ class PaginationView(discord.ui.View): self.pagination: Pagination = pagination self.author: discord.Member = author - self.lang: str = MongoDBHandler.get_cached_settings(author.guild.id).get("lang", "EN") + self.lang: str = MongoDBHandler.get_cached_settings(author.guild.id).get("lang") self.update_view() def update_view(self, extra_states: Optional[Dict[str, Dict[str, str]]] = None) -> None: diff --git a/voicelink/views/playlist.py b/voicelink/views/playlist.py index a4230e4..068fc8f 100644 --- a/voicelink/views/playlist.py +++ b/voicelink/views/playlist.py @@ -189,7 +189,7 @@ class PlaylistViewManager(DynamicViewManager): def __init__(self, ctx: commands.Context, results: list[dict[str, Any]]): self.ctx: commands.Context[commands.Bot] = ctx self.results: list[dict[str, Any]] = results - self.lang: str = MongoDBHandler.get_cached_settings(ctx.guild.id).get("lang", "EN") + self.lang: str = MongoDBHandler.get_cached_settings(ctx.guild.id).get("lang") views = {"home": self} views.update({result["id"]: PlaylistView(self, result) for result in results})