From dfc1e742f88310f5ea6d3af4e08622d29e1216d7 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Thu, 6 Feb 2025 01:42:42 +0100 Subject: [PATCH 1/6] Handle invalid locale configuration graciously during startup (#6517) --- redbot/core/_i18n.py | 3 ++- redbot/core/bot.py | 25 ++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/redbot/core/_i18n.py b/redbot/core/_i18n.py index f2b5e7ec9de..f1f445045df 100644 --- a/redbot/core/_i18n.py +++ b/redbot/core/_i18n.py @@ -22,8 +22,9 @@ ) +FRESH_INSTALL_LOCALE = "en-US" 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_default = None diff --git a/redbot/core/bot.py b/redbot/core/bot.py index a1d1048a2e8..f322595bddc 100644 --- a/redbot/core/bot.py +++ b/redbot/core/bot.py @@ -115,7 +115,7 @@ def __init__(self, *args, cli_flags=None, bot_dir: Path = Path.cwd(), **kwargs): owner=None, whitelist=[], blacklist=[], - locale="en-US", + locale=_i18n.FRESH_INSTALL_LOCALE, regional_format=None, embeds=True, color=15158332, @@ -1145,9 +1145,28 @@ async def _pre_login(self) -> None: self.owner_ids.add(self._owner_id_overwrite) 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.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: """ From 50ad59a6c85054fac92c9ccfc00da891253f8b88 Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Thu, 6 Feb 2025 02:31:03 +0100 Subject: [PATCH 2/6] Catch TypeError when setting global locale (#6518) --- redbot/core/bot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redbot/core/bot.py b/redbot/core/bot.py index f322595bddc..bac5afcbc2e 100644 --- a/redbot/core/bot.py +++ b/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).", From 2fd6ea88d9f5248c846a84e70c4e2d695cb3160c Mon Sep 17 00:00:00 2001 From: Jakub Kuczys Date: Thu, 6 Feb 2025 02:31:40 +0100 Subject: [PATCH 3/6] Red 3.5.16 - Changelog (#6519) --- CHANGES.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index a77beec09f5..708f53e9d6d 100644 --- a/CHANGES.rst +++ b/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) ========================== From 5cf69bdc519ebe693b9cd7c74953dc970225862c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 02:35:50 +0100 Subject: [PATCH 4/6] Automated Crowdin downstream (#6521) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- redbot/core/locales/ar-SA.po | 6 +++--- redbot/core/locales/bg-BG.po | 6 +++--- redbot/core/locales/cs-CZ.po | 6 +++--- redbot/core/locales/da-DK.po | 6 +++--- redbot/core/locales/de-DE.po | 6 +++--- redbot/core/locales/es-ES.po | 6 +++--- redbot/core/locales/fi-FI.po | 6 +++--- redbot/core/locales/fr-FR.po | 6 +++--- redbot/core/locales/hi-IN.po | 6 +++--- redbot/core/locales/hr-HR.po | 6 +++--- redbot/core/locales/hu-HU.po | 6 +++--- redbot/core/locales/id-ID.po | 6 +++--- redbot/core/locales/it-IT.po | 6 +++--- redbot/core/locales/ja-JP.po | 6 +++--- redbot/core/locales/ko-KR.po | 6 +++--- redbot/core/locales/nb-NO.po | 6 +++--- redbot/core/locales/nl-NL.po | 6 +++--- redbot/core/locales/pl-PL.po | 6 +++--- redbot/core/locales/pt-BR.po | 6 +++--- redbot/core/locales/pt-PT.po | 6 +++--- redbot/core/locales/ru-RU.po | 6 +++--- redbot/core/locales/sk-SK.po | 6 +++--- redbot/core/locales/sl-SI.po | 6 +++--- redbot/core/locales/sv-SE.po | 6 +++--- redbot/core/locales/tr-TR.po | 6 +++--- redbot/core/locales/uk-UA.po | 6 +++--- redbot/core/locales/vi-VN.po | 6 +++--- redbot/core/locales/zh-CN.po | 6 +++--- redbot/core/locales/zh-TW.po | 6 +++--- 29 files changed, 87 insertions(+), 87 deletions(-) diff --git a/redbot/core/locales/ar-SA.po b/redbot/core/locales/ar-SA.po index bcc0f42a91f..be578d688ec 100644 --- a/redbot/core/locales/ar-SA.po +++ b/redbot/core/locales/ar-SA.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Arabic\n" "MIME-Version: 1.0\n" @@ -742,11 +742,11 @@ msgstr "لا يمكن دفع ثمن هذا الأمر في DM بدون بنك ع msgid "You need at least {cost} {currency} to use this command." msgstr "تحتاج على الأقل إلى {cost} {currency} لاستخدام هذا الأمر." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/bg-BG.po b/redbot/core/locales/bg-BG.po index 390d8235356..557a01b94a2 100644 --- a/redbot/core/locales/bg-BG.po +++ b/redbot/core/locales/bg-BG.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Bulgarian\n" "MIME-Version: 1.0\n" @@ -748,11 +748,11 @@ msgstr "" msgid "You need at least {cost} {currency} to use this command." msgstr "" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/cs-CZ.po b/redbot/core/locales/cs-CZ.po index f6039ec3025..5710fabe525 100644 --- a/redbot/core/locales/cs-CZ.po +++ b/redbot/core/locales/cs-CZ.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -754,11 +754,11 @@ msgstr "Nelze zaplatit za tento příkaz v DM bez globální banky." msgid "You need at least {cost} {currency} to use this command." msgstr "Potřebujete alespoň {cost} {currency} k použití tohoto příkazu." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/da-DK.po b/redbot/core/locales/da-DK.po index 91a50729c68..f2eba2626d8 100644 --- a/redbot/core/locales/da-DK.po +++ b/redbot/core/locales/da-DK.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -741,11 +741,11 @@ msgstr "Kan ikke betale for denne kommando i PB uden en global bank." msgid "You need at least {cost} {currency} to use this command." msgstr "Du skal bruge mindst {cost} {currency} for at bruge denne kommando." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/de-DE.po b/redbot/core/locales/de-DE.po index af9e075d4a7..5e233e6adef 100644 --- a/redbot/core/locales/de-DE.po +++ b/redbot/core/locales/de-DE.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -773,11 +773,11 @@ msgstr "Dieser Befehl kann ohne eine globale Bank nicht in den Direktnachrichten msgid "You need at least {cost} {currency} to use this command." msgstr "Sie benötigen mindestens {cost} {currency} um diesen Befehl zu verwenden." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "Es bleibt noch eine Nachricht übrig. Geben Sie {command_1} ein, um fortzufahren oder {command_2}, um alle Inhalte als Datei hochzuladen." -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "Es bleiben noch {count} Nachrichten. Geben Sie {command_1} ein, um fortzufahren oder {command_2}, um alle Inhalte als Datei hochzuladen." diff --git a/redbot/core/locales/es-ES.po b/redbot/core/locales/es-ES.po index aebfe2794a6..ec2967adbfe 100644 --- a/redbot/core/locales/es-ES.po +++ b/redbot/core/locales/es-ES.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" @@ -774,11 +774,11 @@ msgstr "No se puede pagar con este comando en DM sin un banco global." msgid "You need at least {cost} {currency} to use this command." msgstr "Necesitas al menos {cost} {currency} para usar este comando." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "Todavía queda un mensaje. Escribe {command_1} para continuar o {command_2} para subir todos los contenidos como archivos." -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "Quedan {count} mensajes pendientes. Escriba {command_1} para continuar o {command_2} para subir todos los contenidos como archivos." diff --git a/redbot/core/locales/fi-FI.po b/redbot/core/locales/fi-FI.po index 52fdb31bd17..7f26c5131e6 100644 --- a/redbot/core/locales/fi-FI.po +++ b/redbot/core/locales/fi-FI.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Finnish\n" "MIME-Version: 1.0\n" @@ -732,11 +732,11 @@ msgstr "Et voi maksaa tästä komennosta yksityisviesteissä ilman globaalia pan msgid "You need at least {cost} {currency} to use this command." msgstr "Sinulla pitää olla vähintään {cost} {currency} käyttääksesi tätä komentoa." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/fr-FR.po b/redbot/core/locales/fr-FR.po index 49b5e54773a..ceab3516c3b 100644 --- a/redbot/core/locales/fr-FR.po +++ b/redbot/core/locales/fr-FR.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -770,11 +770,11 @@ msgstr "Impossible de payer cette commande en message privé sans banque globale msgid "You need at least {cost} {currency} to use this command." msgstr "Vous avez besoin d’au moins {cost} {currency} pour utiliser cette commande." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "Il reste encore un message. Tapez {command_1} pour continuer ou {command_2} pour télécharger tout le contenu en tant que fichier." -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "Il y a encore des messages {count} restants. Tapez {command_1} pour continuer ou {command_2} pour télécharger tout le contenu en tant que fichier." diff --git a/redbot/core/locales/hi-IN.po b/redbot/core/locales/hi-IN.po index b7f4413755e..e6f92762a09 100644 --- a/redbot/core/locales/hi-IN.po +++ b/redbot/core/locales/hi-IN.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Hindi\n" "MIME-Version: 1.0\n" @@ -732,11 +732,11 @@ msgstr "" msgid "You need at least {cost} {currency} to use this command." msgstr "" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/hr-HR.po b/redbot/core/locales/hr-HR.po index b9ada590dcb..384abbc5729 100644 --- a/redbot/core/locales/hr-HR.po +++ b/redbot/core/locales/hr-HR.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Croatian\n" "MIME-Version: 1.0\n" @@ -754,11 +754,11 @@ msgstr "Ne može se platiti za ovu naredbu u DM-u bez globalne banke." msgid "You need at least {cost} {currency} to use this command." msgstr "Za korištenje ove naredbe trebate imati najmanje {cost}{currency}." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/hu-HU.po b/redbot/core/locales/hu-HU.po index f191461865a..8486212870d 100644 --- a/redbot/core/locales/hu-HU.po +++ b/redbot/core/locales/hu-HU.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Hungarian\n" "MIME-Version: 1.0\n" @@ -741,11 +741,11 @@ msgstr "Nem lehet fizetni ézért a parancsért DM-ben globális bank nélkül." msgid "You need at least {cost} {currency} to use this command." msgstr "Legfeljebb {cost}{currency} kell ahoz hogy használd ezt a parancsot." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/id-ID.po b/redbot/core/locales/id-ID.po index ed212e0c6fe..f7f73f6a95a 100644 --- a/redbot/core/locales/id-ID.po +++ b/redbot/core/locales/id-ID.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Indonesian\n" "MIME-Version: 1.0\n" @@ -732,11 +732,11 @@ msgstr "" msgid "You need at least {cost} {currency} to use this command." msgstr "" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/it-IT.po b/redbot/core/locales/it-IT.po index db3881e38be..1f5440312b1 100644 --- a/redbot/core/locales/it-IT.po +++ b/redbot/core/locales/it-IT.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" @@ -746,11 +746,11 @@ msgstr "Impossibile pagare per questo comando in DM senza una banca globale." msgid "You need at least {cost} {currency} to use this command." msgstr "Necessiti di almeno {cost} {currency} per usare questo comando." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/ja-JP.po b/redbot/core/locales/ja-JP.po index 67300eb5bf4..b6a68a09ad5 100644 --- a/redbot/core/locales/ja-JP.po +++ b/redbot/core/locales/ja-JP.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" @@ -739,11 +739,11 @@ msgstr "グローバルバンクがないので、DMでこのコマンドを実 msgid "You need at least {cost} {currency} to use this command." msgstr "このコマンドを使用するには、少なくとも {cost} {currency} が必要です。" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/ko-KR.po b/redbot/core/locales/ko-KR.po index 79dc1de2c43..5e8c75d53d6 100644 --- a/redbot/core/locales/ko-KR.po +++ b/redbot/core/locales/ko-KR.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Korean\n" "MIME-Version: 1.0\n" @@ -732,11 +732,11 @@ msgstr "" msgid "You need at least {cost} {currency} to use this command." msgstr "" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/nb-NO.po b/redbot/core/locales/nb-NO.po index 582c11dc433..d2a73db0804 100644 --- a/redbot/core/locales/nb-NO.po +++ b/redbot/core/locales/nb-NO.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Norwegian Bokmal\n" "MIME-Version: 1.0\n" @@ -771,11 +771,11 @@ msgstr "Kan ikke betale for denne kommandoen i DM uten en global bank." msgid "You need at least {cost} {currency} to use this command." msgstr "Du trenger minst {cost} {currency} for å bruke denne kommandoen." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/nl-NL.po b/redbot/core/locales/nl-NL.po index 746d9f9bfc7..60e36ecdfb2 100644 --- a/redbot/core/locales/nl-NL.po +++ b/redbot/core/locales/nl-NL.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Dutch\n" "MIME-Version: 1.0\n" @@ -732,11 +732,11 @@ msgstr "" msgid "You need at least {cost} {currency} to use this command." msgstr "Je moet minstens {cost} {currency} hebben om dit commando te gebruiken." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/pl-PL.po b/redbot/core/locales/pl-PL.po index f11b737ea23..207562ef45f 100644 --- a/redbot/core/locales/pl-PL.po +++ b/redbot/core/locales/pl-PL.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Polish\n" "MIME-Version: 1.0\n" @@ -757,11 +757,11 @@ msgstr "Nie można zapłacić za tą komendę przez PW bez banku globalnego." msgid "You need at least {cost} {currency} to use this command." msgstr "Potrzebujesz co najmniej {cost} {currency} aby użyć tej komendy." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/pt-BR.po b/redbot/core/locales/pt-BR.po index 63a6b637a8c..7dda56ec08e 100644 --- a/redbot/core/locales/pt-BR.po +++ b/redbot/core/locales/pt-BR.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Portuguese, Brazilian\n" "MIME-Version: 1.0\n" @@ -760,11 +760,11 @@ msgstr "Não pode pagar por este comando em uma mensagem direta sem um banco glo msgid "You need at least {cost} {currency} to use this command." msgstr "Você precisa de pelo menos {cost} {currency} para usar este comando." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/pt-PT.po b/redbot/core/locales/pt-PT.po index 12a730181a0..1f3d0d70161 100644 --- a/redbot/core/locales/pt-PT.po +++ b/redbot/core/locales/pt-PT.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" @@ -743,11 +743,11 @@ msgstr "" msgid "You need at least {cost} {currency} to use this command." msgstr "" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/ru-RU.po b/redbot/core/locales/ru-RU.po index e7da026bc24..875b9a78d73 100644 --- a/redbot/core/locales/ru-RU.po +++ b/redbot/core/locales/ru-RU.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -773,11 +773,11 @@ msgstr "Не удается оплатить эту команду в ЛС бе msgid "You need at least {cost} {currency} to use this command." msgstr "Вам нужно как минимум {cost} {currency} для того чтобы использовать данную команду." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/sk-SK.po b/redbot/core/locales/sk-SK.po index e4be62f4e0c..62048f8f252 100644 --- a/redbot/core/locales/sk-SK.po +++ b/redbot/core/locales/sk-SK.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Slovak\n" "MIME-Version: 1.0\n" @@ -732,11 +732,11 @@ msgstr "" msgid "You need at least {cost} {currency} to use this command." msgstr "" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/sl-SI.po b/redbot/core/locales/sl-SI.po index 7b6d48c3a99..088047f3e3c 100644 --- a/redbot/core/locales/sl-SI.po +++ b/redbot/core/locales/sl-SI.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Slovenian\n" "MIME-Version: 1.0\n" @@ -737,11 +737,11 @@ msgstr "Plačevanje v zasebnih sporočilih ni mogoče brez globalne banke." msgid "You need at least {cost} {currency} to use this command." msgstr "Potrebno je vsaj {cost}{currency} da uporabiš to komando." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/sv-SE.po b/redbot/core/locales/sv-SE.po index c5e198ab2df..6ec2264b331 100644 --- a/redbot/core/locales/sv-SE.po +++ b/redbot/core/locales/sv-SE.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -742,11 +742,11 @@ msgstr "Kan inte betala för detta kommando i DM utan en global bank." msgid "You need at least {cost} {currency} to use this command." msgstr "Du behöver minst {cost} {currency} för att använda detta kommando." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/tr-TR.po b/redbot/core/locales/tr-TR.po index 67ccedae3d4..d94c41220fa 100644 --- a/redbot/core/locales/tr-TR.po +++ b/redbot/core/locales/tr-TR.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Turkish\n" "MIME-Version: 1.0\n" @@ -767,11 +767,11 @@ msgstr "Bu komut için özel mesajda küresel banka olmaksızın ödeme yapılam msgid "You need at least {cost} {currency} to use this command." msgstr "Bu komutu kullanabilmen için {cost} {currency} ihtiyacın var." -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/uk-UA.po b/redbot/core/locales/uk-UA.po index 4c4a6de71b9..f93669d3eea 100644 --- a/redbot/core/locales/uk-UA.po +++ b/redbot/core/locales/uk-UA.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Ukrainian\n" "MIME-Version: 1.0\n" @@ -732,11 +732,11 @@ msgstr "" msgid "You need at least {cost} {currency} to use this command." msgstr "" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/vi-VN.po b/redbot/core/locales/vi-VN.po index 1c24ef16003..08bf399934f 100644 --- a/redbot/core/locales/vi-VN.po +++ b/redbot/core/locales/vi-VN.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Vietnamese\n" "MIME-Version: 1.0\n" @@ -732,11 +732,11 @@ msgstr "" msgid "You need at least {cost} {currency} to use this command." msgstr "" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/zh-CN.po b/redbot/core/locales/zh-CN.po index a2fb644177c..c81c6f67d73 100644 --- a/redbot/core/locales/zh-CN.po +++ b/redbot/core/locales/zh-CN.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "MIME-Version: 1.0\n" @@ -750,11 +750,11 @@ msgstr "如果没有全球银行，无法在DM中支付此命令" msgid "You need at least {cost} {currency} to use this command." msgstr "你至少需要 {cost} {currency} 才能使用此命令" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" diff --git a/redbot/core/locales/zh-TW.po b/redbot/core/locales/zh-TW.po index df619c7a222..9176419d4e8 100644 --- a/redbot/core/locales/zh-TW.po +++ b/redbot/core/locales/zh-TW.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: red-discordbot\n" -"POT-Creation-Date: 2025-01-27 00:33+0000\n" +"POT-Creation-Date: 2025-02-06 00:43+0000\n" "Last-Translator: \n" "Language-Team: Chinese Traditional\n" "MIME-Version: 1.0\n" @@ -764,11 +764,11 @@ msgstr "如果沒有全球銀行，就無法在 DM 中支付此命令。　" msgid "You need at least {cost} {currency} to use this command." msgstr "您至少需要 {cost} {currency} 才能使用此命令。" -#: redbot/core/bot.py:2463 +#: redbot/core/bot.py:2482 msgid "There is still one message remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" -#: redbot/core/bot.py:2468 +#: redbot/core/bot.py:2487 msgid "There are still {count} messages remaining. Type {command_1} to continue or {command_2} to upload all contents as a file." msgstr "" From d6054412f44db40c38da569baeec32521289d53f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 02:36:23 +0100 Subject: [PATCH 5/6] Version bump to 3.5.16 (#6520) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- redbot/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redbot/__init__.py b/redbot/__init__.py index 9c1b4f5148a..5d69ab8da49 100644 --- a/redbot/__init__.py +++ b/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.16" __version__, version_info = VersionInfo._get_version() From 73958d87f134c1186ba7e95adbb11f07079d9cc9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 02:44:41 +0100 Subject: [PATCH 6/6] Version bump to 3.5.17.dev1 (#6522) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- redbot/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redbot/__init__.py b/redbot/__init__.py index 5d69ab8da49..b0d01228193 100644 --- a/redbot/__init__.py +++ b/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" +_VERSION = "3.5.17.dev1" __version__, version_info = VersionInfo._get_version()