mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-09 06:49:12 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #36142 -- Made Http404 messages in *_or_404() shortcuts translatable.

Browse Source
This commit is contained in:
Romain DA COSTA VIEIRA 2025-09-24 14:55:54 +02:00 committed by Sarah Boyce
parent 7894776bc9
commit 1cb76b90e8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/shortcuts.py
View File

@ -13,6 +13,7 @@ from django.http import (
from django.template import loader
from django.urls import NoReverseMatch, reverse
from django.utils.functional import Promise
from django.utils.translation import gettext as _
def render(
@ -90,7 +91,10 @@ def get_object_or_404(klass, *args, **kwargs):
return queryset.get(*args, **kwargs)
except queryset.model.DoesNotExist:
raise Http404(
"No %s matches the given query." % queryset.model._meta.object_name
# Translators: %s is the name of a model, e.g. "No City matches the
# given query."
_("No %s matches the given query.")
% queryset.model._meta.object_name
)
@ -108,7 +112,9 @@ async def aget_object_or_404(klass, *args, **kwargs):
try:
return await queryset.aget(*args, **kwargs)
except queryset.model.DoesNotExist:
raise Http404(f"No {queryset.model._meta.object_name} matches the given query.")
raise Http404(
_("No %s matches the given query.") % queryset.model._meta.object_name
)
def get_list_or_404(klass, *args, **kwargs):
@ -131,7 +137,7 @@ def get_list_or_404(klass, *args, **kwargs):
obj_list = list(queryset.filter(*args, **kwargs))
if not obj_list:
raise Http404(
"No %s matches the given query." % queryset.model._meta.object_name
_("No %s matches the given query.") % queryset.model._meta.object_name
)
return obj_list
@ -149,7 +155,9 @@ async def aget_list_or_404(klass, *args, **kwargs):
)
obj_list = [obj async for obj in queryset.filter(*args, **kwargs)]
if not obj_list:
raise Http404(f"No {queryset.model._meta.object_name} matches the given query.")
raise Http404(
_("No %s matches the given query.") % queryset.model._meta.object_name
)
return obj_list