fix: Preserve blank value for optional fields

deschler · Dec 26, 2024 · f197adc · f197adc
1 parent 1b0bf21
commit f197adc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/modeltranslation/fields.py b/modeltranslation/fields.py
@@ -139,17 +139,22 @@ def __init__(
             # TODO: Do we really want to enforce null *at all*? Shouldn't this
             # better honour the null setting of the translated field?
             self.null = True
+
+        # We preserve original blank value for translated fields,
+        # when they're in 'required_languages'.
+        # So they will be only required if original field itself was required.
+        original_blank = self.blank
         self.blank = True
 
-        # Take required_languages translation option into account
+        # Take required_languages translation option into account.
         trans_opts = translator.get_options_for_model(self.model)
         if trans_opts.required_languages:
             required_languages = trans_opts.required_languages
             if isinstance(required_languages, (tuple, list)):
                 # All fields
                 if self.language in required_languages:
                     # self.null = False
-                    self.blank = False
+                    self.blank = original_blank
             else:
                 # Certain fields only
                 # Try current language - if not present, try 'default' key
@@ -161,7 +166,7 @@ def __init__(
                     # TODO: We might have to handle the whole thing through the
                     # FieldsAggregationMetaClass, as fields can be inherited.
                     # self.null = False
-                    self.blank = False
+                    self.blank = original_blank
 
         # Adjust the name of this field to reflect the language
         self.attname = build_localized_fieldname(self.translated_field.name, language)

diff --git a/modeltranslation/tests/translation.py b/modeltranslation/tests/translation.py
@@ -282,6 +282,9 @@ class RequiredTranslationOptions(TranslationOptions):
     fields = ("non_req", "req", "req_reg", "req_en_reg")
     required_languages = {
         "en": (
+            # We include `non_req` field here, to test that it's `blank` attribute is preserved,
+            # even when languages is required.
+            "non_req",
             "req_reg",
             "req_en_reg",
         ),