Merge pull request #22 from RJacksonm1/master

Fixed steam.loc.language throwing an inappropriate LanguageUnsupportedError

steam/loc.py

@@ -7,15 +7,12 @@
 import os
 from . import api
 
-
 class LanguageError(api.APIError):
     pass
 
-
 class LanguageUnsupportedError(LanguageError):
     pass
 
-
 class language(object):
     """ Steam API localization tools and reference """
 
@@ -42,7 +39,7 @@ class language(object):
                   "zh_TW": "Traditional Chinese",
                   "tr_TR": "Turkish"}
 
-    _default_language = os.environ.get("LANG", "en_US").split('.')[0]
+    _default_language = "en_US"
 
     def __init__(self, code=None):
         """ Raises LanguageUnsupportedError if the code isn't supported by the
@@ -51,7 +48,11 @@ def __init__(self, code=None):
         self._code = None
 
         if not code:
-            self._code = language._default_language
+            _system_language = os.environ.get("LANG", language._default_language).split('.')[0]
+            if _system_language in language._languages.keys():
+                self._code = _system_language
+            else:
+                self._code = language._default_language
         else:
             code = code.lower()
             for lcode, lname in language._languages.items():

tests/testloc.py

@@ -0,0 +1,28 @@
+import unittest
+import os
+import steam
+
+
+class LocTestCase(unittest.TestCase):
+    DEFAULT_LANGUAGE_CODE = "en_US"
+    VALID_LANGUAGE_CODE = "fi_FI"
+    INVALID_LANGUAGE_CODE = "en_GB"
+
+    def test_supported_language(self):
+        lang = steam.loc.language(LocTestCase.VALID_LANGUAGE_CODE)
+        self.assertEquals(lang._code, LocTestCase.VALID_LANGUAGE_CODE)
+
+    def test_unsupported_language(self):
+        self.assertRaises(steam.loc.LanguageUnsupportedError, steam.loc.language, LocTestCase.INVALID_LANGUAGE_CODE)
+
+    def test_supported_language_via_environ(self):
+        os.environ['LANG'] = LocTestCase.VALID_LANGUAGE_CODE
+        lang = steam.loc.language(None)
+        self.assertEquals(lang._code, LocTestCase.VALID_LANGUAGE_CODE)
+
+    def test_unsupported_language_via_environ(self):
+        os.environ['LANG'] = LocTestCase.INVALID_LANGUAGE_CODE
+        lang = steam.loc.language(None)
+        self.assertEquals(lang._code, LocTestCase.DEFAULT_LANGUAGE_CODE)
+
+