Merge branch 'V3/develop' of github.com:Predeactor/Red-DiscordBot into master/chat-formatting-enhancement

This commit is contained in:
Predeactor - Triarius
2021-10-26 21:24:54 +02:00

View File

@@ -838,7 +838,7 @@ class Downloader(commands.Cog):
message += ( message += (
_("\nFailed to install requirements: ") _("\nFailed to install requirements: ")
if len(failed_reqs) > 1 if len(failed_reqs) > 1
else _("\nFailed to install the requirement: ") else _("\nFailed to install requirement: ")
) + humanize_list(tuple(map(inline, failed_reqs))) ) + humanize_list(tuple(map(inline, failed_reqs)))
await self.send_pagified(ctx, message) await self.send_pagified(ctx, message)
return return
@@ -883,7 +883,7 @@ class Downloader(commands.Cog):
( (
_("Successfully installed cogs: ") _("Successfully installed cogs: ")
if len(installed_cogs) > 1 if len(installed_cogs) > 1
else _("Successfully installed the cog: ") else _("Successfully installed the cog:")
) )
+ humanize_list(cognames) + humanize_list(cognames)
+ ( + (
@@ -1436,7 +1436,7 @@ class Downloader(commands.Cog):
_("\nCouldn't find these cogs in {repo.name}: ") _("\nCouldn't find these cogs in {repo.name}: ")
if len(unavailable_cogs) > 1 if len(unavailable_cogs) > 1
else _("\nCouldn't find this cog in {repo.name}: ") else _("\nCouldn't find this cog in {repo.name}: ")
).format(repo=repo) + humanize_list(unavailable_cogs) ) + humanize_list(unavailable_cogs)
if already_installed: if already_installed:
message += ( message += (
_("\nThese cogs were already installed: ") _("\nThese cogs were already installed: ")
@@ -1447,7 +1447,7 @@ class Downloader(commands.Cog):
message += ( message += (
_("\nSome cogs with these names are already installed from different repos: ") _("\nSome cogs with these names are already installed from different repos: ")
if len(name_already_used) > 1 if len(name_already_used) > 1
else _("\nCog with this name is already installed from a different repo.") else _("Cog with this is already installed from a different repo.")
) + humanize_list(name_already_used) ) + humanize_list(name_already_used)
correct_cogs, add_to_message = self._filter_incorrect_cogs(cogs) correct_cogs, add_to_message = self._filter_incorrect_cogs(cogs)
if add_to_message: if add_to_message:
@@ -1492,7 +1492,7 @@ class Downloader(commands.Cog):
message += ( message += (
_("\nThese cogs require higher python version than you have: ") _("\nThese cogs require higher python version than you have: ")
if len(outdated_python_version) if len(outdated_python_version)
else _("\nThis cog requires higher python version than you have: ") else _("This cog requires higher python version than you have: ")
) + humanize_list(outdated_python_version) ) + humanize_list(outdated_python_version)
if outdated_bot_version: if outdated_bot_version:
message += ( message += (
@@ -1502,7 +1502,7 @@ class Downloader(commands.Cog):
) )
if len(outdated_bot_version) > 1 if len(outdated_bot_version) > 1
else _( else _(
"\nThis cog requires different Red version than you currently " "This cog requires different Red version than you currently "
"have ({current_version}): " "have ({current_version}): "
) )
).format(current_version=red_version_info) + humanize_list(outdated_bot_version) ).format(current_version=red_version_info) + humanize_list(outdated_bot_version)
@@ -1595,7 +1595,7 @@ class Downloader(commands.Cog):
) )
else: else:
message += ( message += (
_("\nEnd user data statement of this cog has changed:") _("End user data statement of this cog has changed:")
+ inline(next(iter(cogs_with_changed_eud_statement))) + inline(next(iter(cogs_with_changed_eud_statement)))
+ _("\nYou can use {command} to see the updated statement.\n").format( + _("\nYou can use {command} to see the updated statement.\n").format(
command=inline(f"{ctx.clean_prefix}cog info <repo> <cog>") command=inline(f"{ctx.clean_prefix}cog info <repo> <cog>")