Skip to content

fix: Fix invalid ngettext usage #9560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

fix: Fix invalid ngettext usage #9560

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ba943d
fix: Fix invalid ngettext usage in `Throttled` exception.
last-partizan Oct 14, 2024
398ba98
chore: Use static method
last-partizan Nov 20, 2024
969080f
chore: Catch obsolete properties usage
last-partizan Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions rest_framework/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,23 +226,25 @@ def __init__(self, media_type, detail=None, code=None):
class Throttled(APIException):
status_code = status.HTTP_429_TOO_MANY_REQUESTS
default_detail = _('Request was throttled.')
extra_detail_singular = _('Expected available in {wait} second.')
extra_detail_plural = _('Expected available in {wait} seconds.')
default_code = 'throttled'

def __init__(self, wait=None, detail=None, code=None):
if detail is None:
detail = force_str(self.default_detail)
if wait is not None:
wait = math.ceil(wait)
detail = ' '.join((
detail,
force_str(ngettext(self.extra_detail_singular.format(wait=wait),
self.extra_detail_plural.format(wait=wait),
wait))))
detail = " ".join((detail, force_str(self.extra_detail(wait))))
self.wait = wait
super().__init__(detail, code)

@staticmethod
def extra_detail(wait):
return ngettext(
'Expected available in {wait} second.',
'Expected available in {wait} seconds.',
wait,
).format(wait=wait)


def server_error(request, *args, **kwargs):
"""
Expand Down
Loading