From 5ab5a8119ad7826a799ac19abab257462bcecfde Mon Sep 17 00:00:00 2001 From: Friesi Nator Date: Thu, 26 Sep 2019 20:23:50 +0200 Subject: [PATCH 1/4] Change the hierarchy issue messages, because they are difficult to translate with the verb variable. --- redbot/cogs/admin/admin.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/redbot/cogs/admin/admin.py b/redbot/cogs/admin/admin.py index 1330fb4fe58..80293dd7116 100644 --- a/redbot/cogs/admin/admin.py +++ b/redbot/cogs/admin/admin.py @@ -19,15 +19,29 @@ " Your command failed to successfully complete." ) -HIERARCHY_ISSUE = _( - "I tried to {verb} {role.name} to {member.display_name} but that role" +HIERARCHY_ISSUE_ADD = _( + "I tried to add {role.name} to {member.display_name} but that role" " is higher than my highest role in the Discord hierarchy so I was" " unable to successfully add it. Please give me a higher role and " "try again." ) -USER_HIERARCHY_ISSUE = _( - "I tried to {verb} {role.name} to {member.display_name} but that role" +HIERARCHY_ISSUE_REMOVE = _( + "I tried to remove {role.name} to {member.display_name} but that role" + " is higher than my highest role in the Discord hierarchy so I was" + " unable to successfully add it. Please give me a higher role and " + "try again." +) + +USER_HIERARCHY_ISSUE_ADD = _( + "I tried to add {role.name} to {member.display_name} but that role" + " is higher than your highest role in the Discord hierarchy so I was" + " unable to successfully add it. Please get a higher role and " + "try again." +) + +USER_HIERARCHY_ISSUE_REMOVE = _( + "I tried to remove {role.name} to {member.display_name} but that role" " is higher than your highest role in the Discord hierarchy so I was" " unable to successfully add it. Please get a higher role and " "try again." @@ -112,7 +126,7 @@ async def _addrole(self, ctx: commands.Context, member: discord.Member, role: di except discord.Forbidden: if not self.pass_hierarchy_check(ctx, role): await self.complain( - ctx, T_(HIERARCHY_ISSUE), role=role, member=member, verb=_("add") + ctx, T_(HIERARCHY_ISSUE_ADD), role=role, member=member ) else: await self.complain(ctx, T_(GENERIC_FORBIDDEN)) @@ -129,7 +143,7 @@ async def _removerole(self, ctx: commands.Context, member: discord.Member, role: except discord.Forbidden: if not self.pass_hierarchy_check(ctx, role): await self.complain( - ctx, T_(HIERARCHY_ISSUE), role=role, member=member, verb=_("remove") + ctx, T_(HIERARCHY_ISSUE_REMOVE), role=role, member=member ) else: await self.complain(ctx, T_(GENERIC_FORBIDDEN)) @@ -157,7 +171,7 @@ async def addrole( await self._addrole(ctx, user, rolename) else: await self.complain( - ctx, T_(USER_HIERARCHY_ISSUE), member=user, role=rolename, verb=_("add") + ctx, T_(USER_HIERARCHY_ISSUE_ADD), member=user, role=rolename ) @commands.command() @@ -177,7 +191,7 @@ async def removerole( await self._removerole(ctx, user, rolename) else: await self.complain( - ctx, T_(USER_HIERARCHY_ISSUE), member=user, role=rolename, verb=_("remove") + ctx, T_(USER_HIERARCHY_ISSUE_REMOVE), member=user, role=rolename ) @commands.group() From 9387c8c764d532bca78dd67a2eae9382ad6361af Mon Sep 17 00:00:00 2001 From: Friesi Nator Date: Fri, 27 Sep 2019 16:57:02 +0200 Subject: [PATCH 2/4] Fix typos --- redbot/cogs/admin/admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/redbot/cogs/admin/admin.py b/redbot/cogs/admin/admin.py index 80293dd7116..7963d441385 100644 --- a/redbot/cogs/admin/admin.py +++ b/redbot/cogs/admin/admin.py @@ -27,9 +27,9 @@ ) HIERARCHY_ISSUE_REMOVE = _( - "I tried to remove {role.name} to {member.display_name} but that role" + "I tried to remove {role.name} from {member.display_name} but that role" " is higher than my highest role in the Discord hierarchy so I was" - " unable to successfully add it. Please give me a higher role and " + " unable to successfully remove it. Please give me a higher role and " "try again." ) @@ -41,9 +41,9 @@ ) USER_HIERARCHY_ISSUE_REMOVE = _( - "I tried to remove {role.name} to {member.display_name} but that role" + "I tried to remove {role.name} from {member.display_name} but that role" " is higher than your highest role in the Discord hierarchy so I was" - " unable to successfully add it. Please get a higher role and " + " unable to successfully remove it. Please get a higher role and " "try again." ) From f5fd7e25cee7e4375e045cb727feb7d02f201dad Mon Sep 17 00:00:00 2001 From: Friesi Nator Date: Fri, 27 Sep 2019 17:11:32 +0200 Subject: [PATCH 3/4] Add changelog entry --- changelog.d/admin/3016.enhance.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/admin/3016.enhance.rst diff --git a/changelog.d/admin/3016.enhance.rst b/changelog.d/admin/3016.enhance.rst new file mode 100644 index 00000000000..66f393299d3 --- /dev/null +++ b/changelog.d/admin/3016.enhance.rst @@ -0,0 +1 @@ +Add custom issue messages for adding and removing roles, this makes it easier to create translations. \ No newline at end of file From e7467bd322365bb87146fb762a32a188fc9110fb Mon Sep 17 00:00:00 2001 From: Friesi Nator Date: Fri, 27 Sep 2019 17:49:18 +0200 Subject: [PATCH 4/4] Reformatting with black --- redbot/cogs/admin/admin.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/redbot/cogs/admin/admin.py b/redbot/cogs/admin/admin.py index 7963d441385..5fb7c044c0f 100644 --- a/redbot/cogs/admin/admin.py +++ b/redbot/cogs/admin/admin.py @@ -125,9 +125,7 @@ async def _addrole(self, ctx: commands.Context, member: discord.Member, role: di await member.add_roles(role) except discord.Forbidden: if not self.pass_hierarchy_check(ctx, role): - await self.complain( - ctx, T_(HIERARCHY_ISSUE_ADD), role=role, member=member - ) + await self.complain(ctx, T_(HIERARCHY_ISSUE_ADD), role=role, member=member) else: await self.complain(ctx, T_(GENERIC_FORBIDDEN)) else: @@ -142,9 +140,7 @@ async def _removerole(self, ctx: commands.Context, member: discord.Member, role: await member.remove_roles(role) except discord.Forbidden: if not self.pass_hierarchy_check(ctx, role): - await self.complain( - ctx, T_(HIERARCHY_ISSUE_REMOVE), role=role, member=member - ) + await self.complain(ctx, T_(HIERARCHY_ISSUE_REMOVE), role=role, member=member) else: await self.complain(ctx, T_(GENERIC_FORBIDDEN)) else: @@ -170,9 +166,7 @@ async def addrole( # noinspection PyTypeChecker await self._addrole(ctx, user, rolename) else: - await self.complain( - ctx, T_(USER_HIERARCHY_ISSUE_ADD), member=user, role=rolename - ) + await self.complain(ctx, T_(USER_HIERARCHY_ISSUE_ADD), member=user, role=rolename) @commands.command() @commands.guild_only() @@ -190,9 +184,7 @@ async def removerole( # noinspection PyTypeChecker await self._removerole(ctx, user, rolename) else: - await self.complain( - ctx, T_(USER_HIERARCHY_ISSUE_REMOVE), member=user, role=rolename - ) + await self.complain(ctx, T_(USER_HIERARCHY_ISSUE_REMOVE), member=user, role=rolename) @commands.group() @commands.guild_only()