While selecting proper localized value, keep \"en\" as the last resort

2 files changed, 7 insertions, 1 deletions

diff --git a/sugar_network/db/env.py b/sugar_network/db/env.py
index c927bfc..09ed43f 100644
--- a/sugar_network/db/env.py
+++ b/sugar_network/db/env.py
@@ -68,8 +68,9 @@ def gettext(value, accept_language=None):
         accept_language = [toolkit.default_lang()]
     elif isinstance(accept_language, basestring):
         accept_language = [accept_language]
-    stripped_value = None
+    accept_language.append('en')
 
+    stripped_value = None
     for lang in accept_language:
         result = value.get(lang)
         if result is not None:
diff --git a/tests/units/db/env.py b/tests/units/db/env.py
index 26d9653..953271e 100755
--- a/tests/units/db/env.py
+++ b/tests/units/db/env.py
@@ -35,6 +35,11 @@ class EnvTest(tests.Test):
         self.assertEqual('bar', env.gettext({'1-a': 'foo', '1': 'bar', 'default': 'default'}, '1-b'))
         self.assertEqual('foo', env.gettext({'1-a': 'foo', '2': 'bar', 'default': 'default'}, '1-b'))
 
+    def test_gettext_EnAsTheLastResort(self):
+        toolkit._default_lang = 'en-us'
+        self.assertEqual('right', env.gettext({'a': 'wrong', 'en': 'right'}, 'probe'))
+        self.assertEqual('exact', env.gettext({'a': 'wrong', 'en': 'right', 'probe': 'exact'}, 'probe'))
+
 
 if __name__ == '__main__':
     tests.main()