From 8280067b7e65518ac5a1d0f400f265832b18ef1e Mon Sep 17 00:00:00 2001 From: PhenoM4n4n <61065078+phenom4n4n@users.noreply.github.com> Date: Fri, 18 Dec 2020 15:31:16 -0800 Subject: [PATCH] Improve grammar in max concurrency error (#4501) * better concurrency grammar * remove casing * Apply Bread's suggestion per Draper's comment Co-authored-by: Sean <29239704+Bakersbakebread@users.noreply.github.com> * Thanks Pred Co-authored-by: Predeactor <61093863+Predeactor@users.noreply.github.com> Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com> Co-authored-by: Sean <29239704+Bakersbakebread@users.noreply.github.com> Co-authored-by: Predeactor <61093863+Predeactor@users.noreply.github.com> --- redbot/core/events.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/redbot/core/events.py b/redbot/core/events.py index 9e4bc9e0f..f961e1356 100644 --- a/redbot/core/events.py +++ b/redbot/core/events.py @@ -311,8 +311,19 @@ def init_events(bot, cli_flags): else: msg = _( "Too many people using this command." - " It can only be used {number} time concurrently." - ).format(number=error.number) + " It can only be used once concurrently." + ) + elif error.per in (commands.BucketType.user, commands.BucketType.member): + if error.number > 1: + msg = _( + "That command is still completing," + " it can only be used {number} times per {type} concurrently." + ).format(number=error.number, type=error.per.name) + else: + msg = _( + "That command is still completing," + " it can only be used once per {type} concurrently." + ).format(type=error.per.name) else: if error.number > 1: msg = _( @@ -322,8 +333,8 @@ def init_events(bot, cli_flags): else: msg = _( "Too many people using this command." - " It can only be used {number} time per {type} concurrently." - ).format(number=error.number, type=error.per.name) + " It can only be used once per {type} concurrently." + ).format(type=error.per.name) await ctx.send(msg) else: log.exception(type(error).__name__, exc_info=error)