From 98cc4c08d10cf391522b2c2cb77372911a328c1b Mon Sep 17 00:00:00 2001
From: Swen Kooij <swen@sectorlabs.ro>
Date: Fri, 16 Dec 2016 08:50:04 +0200
Subject: [PATCH] Made tests work once again

---
 localized_fields/fields/localized_value.py | 5 +++--
 settings.py                                | 7 +++----
 tests/test_localized_field.py              | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/localized_fields/fields/localized_value.py b/localized_fields/fields/localized_value.py
index fafdc12..7a9adde 100644
--- a/localized_fields/fields/localized_value.py
+++ b/localized_fields/fields/localized_value.py
@@ -36,7 +36,7 @@ class LocalizedValue:
             was specified.
         """
 
-        language = language or translation.get_language()
+        language = language or settings.LANGUAGE_CODE
         return getattr(self, language, None)
 
     def set(self, language: str, value: str):
@@ -69,7 +69,8 @@ class LocalizedValue:
         back to the primary language if there's no value
         in the current language."""
 
-        value = self.get()
+        value = self.get(translation.get_language())
+
         if not value:
             value = self.get(settings.LANGUAGE_CODE)
 
diff --git a/settings.py b/settings.py
index bcde5c7..49ef880 100644
--- a/settings.py
+++ b/settings.py
@@ -18,7 +18,6 @@ LANGUAGES = (
     ('nl', 'Dutch')
 )
 
-INSTALLED_APPS = [
-    'localized_fields',
-    'tests'
-]
+INSTALLED_APPS = (
+    'tests',
+)
diff --git a/tests/test_localized_field.py b/tests/test_localized_field.py
index 531ac69..840a94b 100644
--- a/tests/test_localized_field.py
+++ b/tests/test_localized_field.py
@@ -64,17 +64,17 @@ class LocalizedValueTestCase(TestCase):
             assert localized_value.get(language) == value
 
     @staticmethod
-    def test_get_current_language():
+    def test_get_default_language():
         """Tests whether the :see:LocalizedValue
         class's see:get function properly
-        gets the value in the current language."""
+        gets the value in the default language."""
 
         keys = get_init_values()
         localized_value = LocalizedValue(keys)
 
-        for language, value in keys.items():
+        for language, _ in keys.items():
             translation.activate(language)
-            assert localized_value.get() == value
+            assert localized_value.get() == keys[settings.LANGUAGE_CODE]
 
     @staticmethod
     def test_set():