From 7bf0311306b72c3e4999c392a996e0f760b72805 Mon Sep 17 00:00:00 2001
From: Swen Kooij <swen@sectorlabs.ro>
Date: Sun, 20 Oct 2019 16:49:33 +0300
Subject: [PATCH] Add a language argument to LocalizedValue.translate(..)

---
 localized_fields/value.py | 31 +++++++++++++++++++++++--------
 tests/test_value.py       | 12 ++++++++++++
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/localized_fields/value.py b/localized_fields/value.py
index 310fc5a..5ee971f 100644
--- a/localized_fields/value.py
+++ b/localized_fields/value.py
@@ -102,17 +102,32 @@ class LocalizedValue(dict):
             for val in value:
                 self._interpret_value(val)
 
-    def translate(self) -> Optional[str]:
-        """Gets the value in the current language or falls back to the next
-        language if there's no value in the current language."""
+    def translate(self, language: Optional[str] = None) -> Optional[str]:
+        """Gets the value in the specified language (or active language).
 
-        fallbacks = getattr(settings, "LOCALIZED_FIELDS_FALLBACKS", {})
+        Arguments:
+            language:
+                The language to get the value in. If not specified,
+                the currently active language is used.
 
-        language = translation.get_language() or settings.LANGUAGE_CODE
-        languages = fallbacks.get(language, [settings.LANGUAGE_CODE])[:]
-        languages.insert(0, language)
+        Returns:
+            The value in the specified (or active) language. If no value
+            is available in the specified language, the value is returned
+            in one of the fallback languages.
+        """
 
-        for lang_code in languages:
+        target_language = (
+            language or translation.get_language() or settings.LANGUAGE_CODE
+        )
+
+        fallback_config = getattr(settings, "LOCALIZED_FIELDS_FALLBACKS", {})
+
+        target_languages = fallback_config.get(
+            target_language, [settings.LANGUAGE_CODE]
+        )
+        target_languages.insert(0, target_language)
+
+        for lang_code in target_languages:
             value = self.get(lang_code)
             if value:
                 return value or None
diff --git a/tests/test_value.py b/tests/test_value.py
index ccd4e8c..688cbfc 100644
--- a/tests/test_value.py
+++ b/tests/test_value.py
@@ -172,6 +172,18 @@ class LocalizedValueTestCase(TestCase):
             with translation.override("nl"):
                 assert localized_value.translate() == "ro"
 
+    @staticmethod
+    def test_translate_custom_language():
+        """Tests whether the :see:LocalizedValue class's translate() ignores
+        the active language when one is specified explicitely."""
+
+        localized_value = LocalizedValue(
+            {settings.LANGUAGE_CODE: settings.LANGUAGE_CODE, "ro": "ro"}
+        )
+
+        with translation.override("en"):
+            assert localized_value.translate("ro") == "ro"
+
     @staticmethod
     def test_deconstruct():
         """Tests whether the :see:LocalizedValue class's :see:deconstruct