CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-21 02:16:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V3/release/3.0.0' into V3/develop

Browse Source 
# Conflicts:
#	redbot/cogs/audio/audio.py
This commit is contained in:
Toby Harradine
2018-12-21 13:37:32 +11:00
parent 3b50ed8192 811634a2b0
commit bdcb69ad37
22 changed files with 422 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
redbot/cogs/trivia/session.py
View File

@@ -114,7 +114,7 @@ class TriviaSession:
async with self.ctx.typing():
await asyncio.sleep(3)
self.count += 1
msg = bold(_("**Question number {num}!").format(num=self.count)) + "\n\n" + question
msg = bold(_("Question number {num}!").format(num=self.count)) + "\n\n" + question
await self.ctx.send(msg)
continue_ = await self.wait_for_answer(answers, delay, timeout)
if continue_ is False:

8
redbot/cogs/trivia/trivia.py
View File

@@ -111,16 +111,14 @@ class Trivia(commands.Cog):
await settings.allow_override.set(enabled)
if enabled:
await ctx.send(
_(
"Done. Trivia lists can now override the trivia settings for this server."
).format(now=enabled)
_("Done. Trivia lists can now override the trivia settings for this server.")
)
else:
await ctx.send(
_(
"Done. Trivia lists can no longer override the trivia settings for this "
"server."
).format(now=enabled)
)
)
@triviaset.command(name="botplays", usage="<true_or_false>")
@@ -506,7 +504,7 @@ class Trivia(commands.Cog):
with path.open(encoding="utf-8") as file:
try:
dict_ = yaml.load(file)
dict_ = yaml.safe_load(file)
except yaml.error.YAMLError as exc:
raise InvalidListError("YAML parsing failed.") from exc
else: