Fix translate_validation: use params (#965)

carltongibson · Dec 17, 2018 · b3c0b81 · b3c0b81
1 parent a6ffe8b
commit b3c0b81
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/django_filters/utils.py b/django_filters/utils.py
@@ -317,7 +317,8 @@ def translate_validation(error_dict):
     from rest_framework.exceptions import ValidationError, ErrorDetail
 
     exc = OrderedDict(
-        (key, [ErrorDetail(e.message, code=e.code) for e in error_list])
+        (key, [ErrorDetail(e.message % (e.params or ()), code=e.code)
+               for e in error_list])
         for key, error_list in error_dict.as_data().items()
     )
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -10,6 +10,7 @@
 
 from django_filters import FilterSet
 from django_filters.exceptions import FieldLookupError
+from django_filters.filters import MultipleChoiceFilter
 from django_filters.utils import (
     MigrationNotice,
     RenameAttributesBase,
@@ -511,17 +512,30 @@ class Meta:
             model = Article
             fields = ['id', 'author', 'name']
 
+        choice = MultipleChoiceFilter(choices=[('1', 'one'), ('2', 'two')])
+
     def test_error_detail(self):
-        f = self.F(data={'id': 'foo', 'author': 'bar', 'name': 'baz'})
+        f = self.F(data={
+            'id': 'foo',
+            'author': 'bar',
+            'name': 'baz',
+            'choice': ['3'],
+        })
         exc = translate_validation(f.errors)
 
         self.assertDictEqual(exc.detail, {
             'id': ['Enter a number.'],
             'author': ['Select a valid choice. That choice is not one of the available choices.'],
+            'choice': ['Select a valid choice. 3 is not one of the available choices.'],
         })
 
     def test_full_error_details(self):
-        f = self.F(data={'id': 'foo', 'author': 'bar', 'name': 'baz'})
+        f = self.F(data={
+            'id': 'foo',
+            'author': 'bar',
+            'name': 'baz',
+            'choice': ['3'],
+        })
         exc = translate_validation(f.errors)
 
         self.assertEqual(exc.get_full_details(), {
@@ -530,4 +544,8 @@ def test_full_error_details(self):
                 'message': 'Select a valid choice. That choice is not one of the available choices.',
                 'code': 'invalid_choice',
             }],
+            'choice': [{
+                'message': 'Select a valid choice. 3 is not one of the available choices.',
+                'code': 'invalid_choice',
+            }],
         })