Use translation context to eliminate most decorators

Author: object-Object

bot/src/ghutils/cogs/app_commands/github.py

@@ -54,11 +54,8 @@ class GitHubCog(GHUtilsCog, GroupCog, group_name="gh"):
 
     # /gh
 
-    @app_commands.command(
-        description=l10n.command_description("gh issue"),
-    )
+    @app_commands.command()
     @app_commands.rename(reference="issue")
-    @l10n.describe(gh_issue=["reference"])
     @l10n.describe_common("visibility")
     async def issue(
         self,
@@ -72,11 +69,8 @@ async def issue(
             embed=_create_issue_embed(*reference),
         )
 
-    @app_commands.command(
-        description=l10n.command_description("gh pr"),
-    )
+    @app_commands.command()
     @app_commands.rename(reference="pr")
-    @l10n.describe(gh_pr=["reference"])
     @l10n.describe_common("visibility")
     async def pr(
         self,
@@ -90,11 +84,8 @@ async def pr(
             embed=_create_issue_embed(*reference),
         )
 
-    @app_commands.command(
-        description=l10n.command_description("gh commit"),
-    )
+    @app_commands.command()
     @app_commands.rename(reference="commit")
-    @l10n.describe(gh_commit=["reference"])
     @l10n.describe_common("visibility")
     async def commit(
         self,
@@ -135,10 +126,7 @@ async def commit(
 
         await respond_with_visibility(interaction, visibility, embed=embed)
 
-    @app_commands.command(
-        description=l10n.command_description("gh repo"),
-    )
-    @l10n.describe(gh_repo=["repo"])
+    @app_commands.command()
     @l10n.describe_common("visibility")
     async def repo(
         self,
@@ -173,9 +161,7 @@ async def repo(
 
         await respond_with_visibility(interaction, visibility, embed=embed)
 
-    @app_commands.command(
-        description=l10n.command_description("gh login"),
-    )
+    @app_commands.command()
     async def login(self, interaction: Interaction):
         user_id = interaction.user.id
         login_id = str(uuid.uuid4())
@@ -197,9 +183,7 @@ async def login(self, interaction: Interaction):
             ephemeral=True,
         )
 
-    @app_commands.command(
-        description=l10n.command_description("gh logout"),
-    )
+    @app_commands.command()
     async def logout(self, interaction: Interaction):
         with self.bot.db_session() as session:
             # TODO: this should delete the authorization too, but idk how
@@ -218,9 +202,7 @@ async def logout(self, interaction: Interaction):
                     ephemeral=True,
                 )
 
-    @app_commands.command(
-        description=l10n.command_description("gh status"),
-    )
+    @app_commands.command()
     @l10n.describe_common("visibility")
     async def status(
         self,
@@ -278,11 +260,8 @@ async def status(
 
         await respond_with_visibility(interaction, visibility, embed=embed)
 
-    class Search(SubGroup, description=l10n.command_description("gh search")):
-        @app_commands.command(
-            description=l10n.command_description("gh search files"),
-        )
-        @l10n.describe(gh_search_files=["repo", "query", "ref", "exact", "limit"])
+    class Search(SubGroup):
+        @app_commands.command()
         @l10n.describe_common("visibility")
         async def files(
             self,

bot/src/ghutils/core/translator.py

@@ -1,10 +1,16 @@
 from contextlib import ExitStack
 
 from discord import Locale
-from discord.app_commands import TranslationContextTypes, Translator, locale_str
+from discord.app_commands import (
+    TranslationContextLocation,
+    TranslationContextTypes,
+    Translator,
+    locale_str,
+)
 from fluent.runtime import FluentLocalization, FluentResourceLoader
 
 from ghutils.resources import load_resource_dir
+from ghutils.utils.l10n import command_description_id, parameter_description_id
 
 
 class GHUtilsTranslator(Translator):
@@ -32,5 +38,22 @@ async def translate(
         locale: Locale,
         context: TranslationContextTypes,
     ) -> str | None:
-        msg_id = string.extras.get("id", string.message)
-        return self.l10n[locale].format_value(msg_id, string.extras)
+        match string.extras:
+            case {"id": str(msg_id)}:
+                pass
+            case _:
+                match context.location:
+                    case TranslationContextLocation.command_description:
+                        msg_id = command_description_id(context.data.qualified_name)
+                    case TranslationContextLocation.parameter_description:
+                        msg_id = parameter_description_id(
+                            command=context.data.command.qualified_name,
+                            parameter=context.data.name,
+                        )
+                    case _:
+                        msg_id = string.message
+
+        result = self.l10n[locale].format_value(msg_id, string.extras)
+        if result == msg_id:
+            return string.message
+        return result

bot/src/ghutils/utils/l10n.py

@@ -11,14 +11,23 @@
 _SEPARATOR_PATTERN = re.compile(r"[ _-]+")
 
 
+def command_description_id(command: str):
+    command = _format_identifier(command)
+    return f"command-description_{command}"
+
+
 def command_description(command: str):
-    command = _format_command(command)
-    return locale_str(f"command-description_{command}")
+    return locale_str("...", id=command_description_id(command))
+
+
+def parameter_description_id(command: str | None, parameter: str):
+    command = _format_identifier(command or "common")
+    parameter = _format_identifier(parameter)
+    return f"parameter-description_{command}_{parameter}"
 
 
 def parameter_description(command: str | None, parameter: str):
-    command = _format_command(command or "common")
-    return locale_str(f"parameter-description_{command}_{parameter}")
+    return locale_str("...", id=parameter_description_id(command, parameter))
 
 
 def describe_common(*parameters: str):
@@ -44,5 +53,5 @@ def describe(
     })
 
 
-def _format_command(command: str):
+def _format_identifier(command: str):
     return _SEPARATOR_PATTERN.sub("-", command).replace("/", "")