From 390145ca0e234eff680919b7a5c20eb20c93340e Mon Sep 17 00:00:00 2001 From: profitroll Date: Tue, 29 Apr 2025 16:47:15 +0200 Subject: [PATCH] Added i18n to the jailing mechanism --- cogs/cog_event.py | 9 +++------ cogs/cog_register.py | 2 +- cogs/cog_stage.py | 9 +++------ cogs/cog_unregister.py | 2 +- cogs/cog_user.py | 26 ++++++++++++++++++-------- locale/en-US.json | 6 +++++- 6 files changed, 31 insertions(+), 23 deletions(-) diff --git a/cogs/cog_event.py b/cogs/cog_event.py index 0a0273d..fc788ec 100644 --- a/cogs/cog_event.py +++ b/cogs/cog_event.py @@ -191,8 +191,7 @@ class CogEvent(Cog): try: pycord_event: PycordEvent = await self.bot.find_event(event_id=event) except (InvalidId, EventNotFoundError): - # TODO Make a nice message - await ctx.respond("Event was not found.") + await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale), ephemeral=True) return if not guild.is_configured(): @@ -287,8 +286,7 @@ class CogEvent(Cog): try: pycord_event: PycordEvent = await self.bot.find_event(event_id=event) except (InvalidId, EventNotFoundError): - # TODO Make a nice message - await ctx.respond("Event was not found.") + await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale), ephemeral=True) return if not guild.is_configured(): @@ -333,8 +331,7 @@ class CogEvent(Cog): try: pycord_event: PycordEvent = await self.bot.find_event(event_id=event) except (InvalidId, EventNotFoundError): - # TODO Make a nice message - await ctx.respond("Event was not found.") + await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale), ephemeral=True) return starts_date: datetime = pycord_event.get_start_date_utc() diff --git a/cogs/cog_register.py b/cogs/cog_register.py index 34308a6..d116785 100644 --- a/cogs/cog_register.py +++ b/cogs/cog_register.py @@ -46,7 +46,7 @@ class CogRegister(Cog): try: pycord_event: PycordEvent = await self.bot.find_event(event_id=event) except (InvalidId, EventNotFoundError): - await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale)) + await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale), ephemeral=True) return if not guild.is_configured(): diff --git a/cogs/cog_stage.py b/cogs/cog_stage.py index 1e09690..482d098 100644 --- a/cogs/cog_stage.py +++ b/cogs/cog_stage.py @@ -94,8 +94,7 @@ class CogStage(Cog): try: pycord_event: PycordEvent = await self.bot.find_event(event_id=event) except (InvalidId, EventStageNotFoundError): - # TODO Make a nice message - await ctx.respond("Event was not found.") + await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale), ephemeral=True) return if not (await is_event_status_valid(ctx, pycord_event)): @@ -208,8 +207,7 @@ class CogStage(Cog): try: pycord_event: PycordEvent = await self.bot.find_event(event_id=event) except (InvalidId, EventNotFoundError): - # TODO Make a nice message - await ctx.respond("Event was not found.") + await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale), ephemeral=True) return if not (await is_event_status_valid(ctx, pycord_event)): @@ -293,8 +291,7 @@ class CogStage(Cog): try: pycord_event: PycordEvent = await self.bot.find_event(event_id=event) except (InvalidId, EventNotFoundError): - # TODO Make a nice message - await ctx.respond("Event was not found.") + await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale), ephemeral=True) return if not (await is_event_status_valid(ctx, pycord_event)): diff --git a/cogs/cog_unregister.py b/cogs/cog_unregister.py index 6def4b7..4e18604 100644 --- a/cogs/cog_unregister.py +++ b/cogs/cog_unregister.py @@ -49,7 +49,7 @@ class CogUnregister(Cog): try: pycord_event: PycordEvent = await self.bot.find_event(event_id=event) except (InvalidId, EventNotFoundError): - await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale)) + await ctx.respond(self.bot._("event_not_found", "messages", locale=ctx.locale), ephemeral=True) return if not guild.is_configured(): diff --git a/cogs/cog_user.py b/cogs/cog_user.py index cc73f5b..3e725cc 100644 --- a/cogs/cog_user.py +++ b/cogs/cog_user.py @@ -90,15 +90,20 @@ class CogUser(Cog): pycord_user: PycordUser = await self.bot.find_user(user, ctx.guild) if pycord_user.is_jailed: - # TODO Introduce i18n - await ctx.respond(f"User **{user.display_name}** is already jailed.") + await ctx.respond( + self.bot._("user_jail_already_jailed", "messages", locale=ctx.locale).format( + display_name=user.display_name + ), + ephemeral=True, + ) return await pycord_user.jail(self.bot.cache) - # TODO Introduce i18n await ctx.respond( - f"User **{user.display_name}** has been jailed and cannot interact with events anymore." + self.bot._("user_jail_successful", "messages", locale=ctx.locale).format( + display_name=user.display_name + ) ) @command_group.command( @@ -128,15 +133,20 @@ class CogUser(Cog): pycord_user: PycordUser = await self.bot.find_user(user, ctx.guild) if not pycord_user.is_jailed: - # TODO Introduce i18n - await ctx.respond(f"User **{user.display_name}** is not jailed.") + await ctx.respond( + self.bot._("user_unjail_not_jailed", "messages", locale=ctx.locale).format( + display_name=user.display_name + ), + ephemeral=True, + ) return await pycord_user.unjail(self.bot.cache) - # TODO Introduce i18n await ctx.respond( - f"User **{user.display_name}** has been unjailed and can interact with events again." + self.bot._("user_unjail_successful", "messages", locale=ctx.locale).format( + display_name=user.display_name + ) ) diff --git a/locale/en-US.json b/locale/en-US.json index 333ac80..2caf257 100644 --- a/locale/en-US.json +++ b/locale/en-US.json @@ -24,7 +24,11 @@ "timezone_invalid": "Timezone **{timezone}** was not found. Please, select one of the timezones provided by the autocompletion.", "unexpected_error": "An unexpected error has occurred. Please, contact the administrator.", "unregister_not_registered": "You are not registered for this event.", - "unregister_unregistered": "You are no longer registered for this event." + "unregister_unregistered": "You are no longer registered for this event.", + "user_jail_already_jailed": "User **{display_name}** is already jailed.", + "user_jail_successful": "User **{display_name}** has been jailed and cannot interact with events anymore.", + "user_unjail_not_jailed": "User **{display_name}** is not jailed.", + "user_unjail_successful": "User **{display_name}** has been unjailed and can interact with events again." }, "commands": { "config": {