[pull] V3/develop from Cog-Creators:V3/develop

CHANGES.rst

@@ -1,5 +1,21 @@
 .. Red changelogs
 
+Redbot 3.5.16 (2025-02-06)
+==========================
+
+| Thanks to all these amazing people that contributed to this release:
+| :ghuser:`Flame442`, :ghuser:`Jackenmen`
+
+This is a hotfix release changing our implementation to prevent crash at startup
+when invalid value of global locale/regional format configuration is encountered.
+We have seen a few reports of this occurring and we believe that this was caused by
+some 3rd-party cog(s) passing invalid values to Red <3.5 i18n APIs as those versions
+did not validate the input in some scenarios. During startup, Red will now simply
+log a warning, if it encounters incorrect global locale/regional format configuration
+and reset it to a known valid value.
+
+----
+
 Redbot 3.5.15 (2025-02-03)
 ==========================
 

redbot/__init__.py

@@ -339,7 +339,7 @@ def _early_init():
 
 
 # This is bumped automatically by release workflow (`.github/workflows/scripts/bump_version.py`)
-_VERSION = "3.5.16.dev1"
+_VERSION = "3.5.17.dev1"
 
 __version__, version_info = VersionInfo._get_version()
 

redbot/core/bot.py

@@ -1147,7 +1147,7 @@ async def _pre_login(self) -> None:
         i18n_locale = await self._config.locale()
         try:
             _i18n.set_global_locale(i18n_locale)
-        except ValueError:
+        except (ValueError, TypeError):
             log.warning(
                 "The bot's global locale was set to an invalid value (%r)"
                 " and will be reset to default (%s).",
@@ -1159,7 +1159,7 @@ async def _pre_login(self) -> None:
         i18n_regional_format = await self._config.regional_format()
         try:
             _i18n.set_global_regional_format(i18n_regional_format)
-        except ValueError:
+        except (ValueError, TypeError):
             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).",