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

[5.2.x] Fixed #36314 -- Fixed MinimumLengthValidator error message translation.

Browse Source 
Regression in ec7d69035a408b357f1803ca05a7c991cc358cfa.

Thank you Gabriel Trouvé for the report and Claude Paroz for the review.

Backport of d469db978ea6a705549b9519313d9adc198e4232 from main.
This commit is contained in:
Ahmed Nassar 2025-04-16 17:02:56 +02:00 committed by Sarah Boyce
parent cbdb1bed04
commit adf2991d32
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
django/contrib/auth/password_validation.py
View File

@ -106,15 +106,20 @@ class MinimumLengthValidator:
def validate(self, password, user=None):
if len(password) < self.min_length:
raise ValidationError(self.get_error_message(), code="password_too_short")
raise ValidationError(
self.get_error_message(),
code="password_too_short",
params={"min_length": self.min_length},
)
def get_error_message(self):
return ngettext(
"This password is too short. It must contain at least %d character."
% self.min_length,
"This password is too short. It must contain at least %d characters."
% self.min_length,
self.min_length,
return (
ngettext(
"This password is too short. It must contain at least %d character.",
"This password is too short. It must contain at least %d characters.",
self.min_length,
)
% self.min_length
)
def get_help_text(self):

4
docs/releases/5.2.1.txt
View File

@ -36,3 +36,7 @@ Bugfixes
* Fixed a regression in Django 5.2 that caused improper values to be returned
from ``QuerySet.values_list()`` when duplicate field names were specified
(:ticket:`36288`).
* Fixed a regression in Django 5.2 where the password validation error message
from ``MinimumLengthValidator`` was not translated when using non-English
locales (:ticket:`36314`).

26
tests/auth_tests/test_validators.py
View File

@ -1,4 +1,5 @@
import os
from unittest import mock
from django.contrib.auth import validators
from django.contrib.auth.models import User
@ -132,11 +133,16 @@ class MinimumLengthValidatorTest(SimpleTestCase):
with self.assertRaises(ValidationError) as cm:
MinimumLengthValidator().validate("1234567")
self.assertEqual(cm.exception.messages, [expected_error % 8])
self.assertEqual(cm.exception.error_list[0].code, "password_too_short")
error = cm.exception.error_list[0]
self.assertEqual(error.code, "password_too_short")
self.assertEqual(error.params, {"min_length": 8})
with self.assertRaises(ValidationError) as cm:
MinimumLengthValidator(min_length=3).validate("12")
self.assertEqual(cm.exception.messages, [expected_error % 3])
error = cm.exception.error_list[0]
self.assertEqual(error.code, "password_too_short")
self.assertEqual(error.params, {"min_length": 3})
def test_help_text(self):
self.assertEqual(
@ -144,6 +150,24 @@ class MinimumLengthValidatorTest(SimpleTestCase):
"Your password must contain at least 8 characters.",
)
@mock.patch("django.contrib.auth.password_validation.ngettext")
def test_l10n(self, mock_ngettext):
with self.subTest("get_error_message"):
MinimumLengthValidator().get_error_message()
mock_ngettext.assert_called_with(
"This password is too short. It must contain at least %d character.",
"This password is too short. It must contain at least %d characters.",
8,
)
mock_ngettext.reset()
with self.subTest("get_help_text"):
MinimumLengthValidator().get_help_text()
mock_ngettext.assert_called_with(
"Your password must contain at least %(min_length)d " "character.",
"Your password must contain at least %(min_length)d " "characters.",
8,
)
def test_custom_error(self):
class CustomMinimumLengthValidator(MinimumLengthValidator):
def get_error_message(self):