Pluralize "infractions" as necessary. (#545)

Pluralize "infractions" as necessary.

1 files changed, 10 insertions, 2 deletions

diff --git a/bot/cogs/moderation/infractions.py b/bot/cogs/moderation/infractions.py
index 592ead60f..f2ae7b95d 100644
--- a/bot/cogs/moderation/infractions.py
+++ b/bot/cogs/moderation/infractions.py
@@ -2,6 +2,7 @@ import logging
 import textwrap
 import typing as t
 from datetime import datetime
+from gettext import ngettext
 
 import dateutil.parser
 import discord
@@ -436,7 +437,13 @@ class Infractions(Scheduler, commands.Cog):
 
         # Default values for the confirmation message and mod log.
         confirm_msg = f":ok_hand: applied"
-        expiry_msg = f" until {expiry}" if expiry else " permanently"
+
+        # Specifying an expiry for a note or warning makes no sense.
+        if infr_type in ("note", "warning"):
+            expiry_msg = ""
+        else:
+            expiry_msg = f" until {expiry}" if expiry else " permanently"
+
         dm_result = ""
         dm_log_text = ""
         expiry_log_text = f"Expires: {expiry}" if expiry else ""
@@ -463,7 +470,8 @@ class Infractions(Scheduler, commands.Cog):
                 "bot/infractions",
                 params={"user__id": str(user.id)}
             )
-            end_msg = f" ({len(infractions)} infractions total)"
+            total = len(infractions)
+            end_msg = f" ({total} infraction{ngettext('', 's', total)} total)"
 
         # Execute the necessary actions to apply the infraction on Discord.
         if action_coro: