Move common parameter definitions into Fluent

Author: object-Object

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

@@ -26,7 +26,6 @@
     UserGitHubTokens,
     UserLogin,
 )
-from ghutils.utils import l10n
 from ghutils.utils.discord.embeds import set_embed_author
 from ghutils.utils.discord.references import (
     CommitReference,
@@ -56,7 +55,6 @@ class GitHubCog(GHUtilsCog, GroupCog, group_name="gh"):
 
     @app_commands.command()
     @app_commands.rename(reference="issue")
-    @l10n.describe_common("visibility")
     async def issue(
         self,
         interaction: Interaction,
@@ -71,7 +69,6 @@ async def issue(
 
     @app_commands.command()
     @app_commands.rename(reference="pr")
-    @l10n.describe_common("visibility")
     async def pr(
         self,
         interaction: Interaction,
@@ -86,7 +83,6 @@ async def pr(
 
     @app_commands.command()
     @app_commands.rename(reference="commit")
-    @l10n.describe_common("visibility")
     async def commit(
         self,
         interaction: Interaction,
@@ -127,7 +123,6 @@ async def commit(
         await respond_with_visibility(interaction, visibility, embed=embed)
 
     @app_commands.command()
-    @l10n.describe_common("visibility")
     async def repo(
         self,
         interaction: Interaction,
@@ -162,7 +157,6 @@ async def repo(
         await respond_with_visibility(interaction, visibility, embed=embed)
 
     @app_commands.command()
-    @l10n.describe_common("visibility")
     async def user(
         self,
         interaction: Interaction,
@@ -252,7 +246,6 @@ async def logout(self, interaction: Interaction):
                 )
 
     @app_commands.command()
-    @l10n.describe_common("visibility")
     async def status(
         self,
         interaction: Interaction,
@@ -311,7 +304,6 @@ async def status(
 
     class Search(SubGroup):
         @app_commands.command()
-        @l10n.describe_common("visibility")
         async def files(
             self,
             interaction: Interaction,

bot/src/ghutils/resources/l10n/en-US/main.ftl

@@ -6,7 +6,7 @@
 
 # common parameters
 
-parameter-description_common_visibility =
+-parameter-description_visibility =
     Whether the message should be visible to everyone, or just you.
 
 # /gh issue
@@ -17,6 +17,9 @@ command-description_gh-issue =
 parameter-description_gh-issue_reference =
     Issue to look up (`owner/repo#123` or `#123`). Use `/gh login` to get autocomplete.
 
+parameter-description_gh-issue_visibility =
+    {-parameter-description_visibility}
+
 # /gh pr
 
 command-description_gh-pr =
@@ -25,6 +28,9 @@ command-description_gh-pr =
 parameter-description_gh-pr_reference =
     Pull request to look up (`owner/repo#123` or `#123`). Use `/gh login` to get autocomplete.
 
+parameter-description_gh-pr_visibility =
+    {-parameter-description_visibility}
+
 # /gh commit
 
 command-description_gh-commit =
@@ -33,16 +39,25 @@ command-description_gh-commit =
 parameter-description_gh-commit_reference =
     Commit SHA to look up (`owner/repo@sha` or `@sha`). Use `/gh login` to get autocomplete.
 
+parameter-description_gh-commit_visibility =
+    {-parameter-description_visibility}
+
 # /gh repo
 
 command-description_gh-repo =
     Get a link to a GitHub repository.
 
+parameter-description_gh-repo_visibility =
+    {-parameter-description_visibility}
+
 # /gh user
 
 command-description_gh-user =
     Get a link to a GitHub user.
 
+parameter-description_gh-user_visibility =
+    {-parameter-description_visibility}
+
 # /gh login
 
 command-description_gh-login =
@@ -58,6 +73,9 @@ command-description_gh-logout =
 command-description_gh-status =
     Show information about GitHub Utils.
 
+parameter-description_gh-status_visibility =
+    {-parameter-description_visibility}
+
 # /gh search
 
 command-description_gh-search =
@@ -82,3 +100,6 @@ parameter-description_gh-search-files_exact =
 
 parameter-description_gh-search-files_limit =
     Maximum number of results to show.
+
+parameter-description_gh-search-files_visibility =
+    {-parameter-description_visibility}

bot/src/ghutils/utils/l10n.py

@@ -1,9 +1,7 @@
 """Localization helpers."""
 
 import re
-from typing import Mapping
 
-from discord import app_commands
 from discord.app_commands import locale_str
 
 type StrIterable = list[str] | tuple[str, ...]
@@ -30,28 +28,5 @@ def parameter_description(command: str | None, parameter: str):
     return locale_str("...", id=parameter_description_id(command, parameter))
 
 
-def describe_common(*parameters: str):
-    return describe(common=parameters)
-
-
-def describe(
-    dict_args: Mapping[str, StrIterable] | None = None,
-    **kwargs: StrIterable,
-):
-    """Localize app command parameters.
-
-    Key: command to localize parameters for.
-
-    Value: parameter names.
-    """
-    if dict_args:
-        kwargs |= dict_args
-    return app_commands.describe(**{
-        parameter: parameter_description(command, parameter)
-        for command, parameters in kwargs.items()
-        for parameter in parameters
-    })
-
-
 def _format_identifier(command: str):
     return _SEPARATOR_PATTERN.sub("-", command).replace("/", "")