Merge branch 'master' into channel

Signed-off-by: Lumouille <[email protected]>

Author: Lumabots

.github/workflows/docs-localization-download.yml

@@ -40,7 +40,7 @@ jobs:
         working-directory: ./docs
       - name: "Crowdin"
         id: crowdin
-        uses: crowdin/github-action@v2.6.1
+        uses: crowdin/github-action@v2.7.0
         with:
           upload_sources: false
           upload_translations: false

.github/workflows/docs-localization-upload.yml

@@ -44,7 +44,7 @@ jobs:
           sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
         working-directory: ./docs
       - name: "Crowdin"
-        uses: crowdin/github-action@v2.6.1
+        uses: crowdin/github-action@v2.7.0
         with:
           upload_sources: true
           upload_translations: false

CHANGELOG.md

@@ -103,6 +103,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2739](https://github.com/Pycord-Development/pycord/pull/2739))
 - Fixed missing `None` type hints in `Select.__init__`.
   ([#2746])(https://github.com/Pycord-Development/pycord/pull/2746)
+- Updated `valid_locales` to support `in` and `es-419`.
+  ([#2767])(https://github.com/Pycord-Development/pycord/pull/2767)
 - Fixed parameters for channels And allow creating channels with None as default
   reaction ([#2754])(https://github.com/Pycord-Development/pycord/pull/2754)
 

discord/cog.py

@@ -151,17 +151,6 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
 
         new_cls = super().__new__(cls, name, bases, attrs, **kwargs)
 
-        valid_commands = [
-            (c for i, c in j.__dict__.items() if isinstance(c, _BaseCommand))
-            for j in reversed(new_cls.__mro__)
-        ]
-        if any(isinstance(i, ApplicationCommand) for i in valid_commands) and any(
-            not isinstance(i, _BaseCommand) for i in valid_commands
-        ):
-            _filter = ApplicationCommand
-        else:
-            _filter = _BaseCommand
-
         for base in reversed(new_cls.__mro__):
             for elem, value in base.__dict__.items():
                 if elem in commands:
@@ -178,7 +167,7 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
                 is_static_method = isinstance(value, staticmethod)
                 if is_static_method:
                     value = value.__func__
-                if isinstance(value, _filter):
+                if isinstance(value, _BaseCommand):
                     if is_static_method:
                         raise TypeError(
                             f"Command in method {base}.{elem!r} must not be"

discord/commands/core.py

@@ -2042,11 +2042,13 @@ def command(**kwargs):
 
 docs = "https://discord.com/developers/docs"
 valid_locales = [
+    "id",
     "da",
     "de",
     "en-GB",
     "en-US",
     "es-ES",
+    "es-419",
     "fr",
     "hr",
     "it",

requirements/dev.txt

@@ -4,7 +4,7 @@ pytest~=8.3.5
 pytest-asyncio~=0.24.0
 # pytest-order~=1.0.1
 mypy~=1.15.0
-coverage~=7.7
+coverage~=7.8
 pre-commit==4.2.0
 codespell==2.4.1
 bandit==1.8.3

requirements/docs.txt

@@ -7,5 +7,5 @@ sphinx-copybutton==0.5.2
 furo==2024.8.6
 sphinx-autodoc-typehints==2.2.3
 sphinx-intl==2.3.1
-typing_extensions==4.12.2
+typing_extensions==4.13.1
 levenshtein==0.27.1