CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 03:08:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle invalid locale configuration graciously during startup (#6517)

Browse Source
This commit is contained in:
Jakub Kuczys 2025-02-06 01:42:42 +01:00 committed by GitHub
parent 769c319ffd
commit dfc1e742f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
redbot/core/_i18n.py
View File

@ -22,8 +22,9 @@ __all__ = (
) )
FRESH_INSTALL_LOCALE = "en-US"
current_locale = ContextVar("current_locale") current_locale = ContextVar("current_locale")
current_locale_default = "en-US" current_locale_default = FRESH_INSTALL_LOCALE
current_regional_format = ContextVar("current_regional_format") current_regional_format = ContextVar("current_regional_format")
current_regional_format_default = None current_regional_format_default = None

25
redbot/core/bot.py
View File

@ -115,7 +115,7 @@ class Red(
owner=None, owner=None,
whitelist=[], whitelist=[],
blacklist=[], blacklist=[],
locale="en-US", locale=_i18n.FRESH_INSTALL_LOCALE,
regional_format=None, regional_format=None,
embeds=True, embeds=True,
color=15158332, color=15158332,
@ -1145,9 +1145,28 @@ class Red(
self.owner_ids.add(self._owner_id_overwrite) self.owner_ids.add(self._owner_id_overwrite)
i18n_locale = await self._config.locale() i18n_locale = await self._config.locale()
_i18n.set_global_locale(i18n_locale) try:
_i18n.set_global_locale(i18n_locale)
except ValueError:
log.warning(
"The bot's global locale was set to an invalid value (%r)"
" and will be reset to default (%s).",
i18n_locale,
_i18n.FRESH_INSTALL_LOCALE,
)
i18n_locale = _i18n.FRESH_INSTALL_LOCALE
await self._config.locale.clear()
i18n_regional_format = await self._config.regional_format() i18n_regional_format = await self._config.regional_format()
_i18n.set_global_regional_format(i18n_regional_format) try:
_i18n.set_global_regional_format(i18n_regional_format)
except ValueError:
log.warning(
"The bot's global regional format was set to an invalid value (%r)"
" and will be reset to default (which is to inherit global locale, i.e. %s).",
i18n_regional_format,
i18n_locale,
)
await self._config.regional_format.clear()
async def _pre_connect(self) -> None: async def _pre_connect(self) -> None:
""" """