rc

Freeseer · Nov 13, 2014 · 7e96e53 · 7e96e53
1 parent ae66e6a
commit 7e96e53
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/...seer/frontend/qtcommon/languages/tr_ja.ts → ...r/frontend/qtcommon/languages/tr_ja_JP.ts b/...seer/frontend/qtcommon/languages/tr_ja.ts → ...r/frontend/qtcommon/languages/tr_ja_JP.ts
diff --git a/src/freeseer/settings.py b/src/freeseer/settings.py
@@ -44,11 +44,8 @@ def detect_system_language():
     translation = 'tr_{}'.format(QLocale.system().name())
     translation_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'frontend', 'qtcommon', 'languages')
     translation_country_language = os.path.join(translation_path, '{}.ts'.format(translation))
-    translation_language = os.path.join(translation_path, '{}.ts'.format(translation.split('-')[0]))
     if os.path.isfile(translation_country_language):
         return '{}.qm'.format(translation)
-    elif os.path.isfile(translation_language):
-        return '{}.qm'.format(translation.split('-')[0])
     else:
         return 'tr_en_US.qm'
 

diff --git a/src/freeseer/tests/test_settings.py b/src/freeseer/tests/test_settings.py
@@ -32,7 +32,7 @@ class TestSettings:
 
     def test_detect_system_language_translation_found(self, monkeypatch):
         """Tests detect_system_language() returns the appropriate translation filename for the system language."""
-        locales = ("ar_EG", "de_DE", "en_US", "fr_CA", "ja", "nl_NL", "sv_SE", "zh_CN", "zh_HK")
+        locales = ("ar_EG", "de_DE", "en_US", "fr_CA", "ja_JP", "nl_NL", "sv_SE", "zh_CN", "zh_HK")
         for locale in locales:
             monkeypatch.setattr(QLocale, "name", lambda x: locale)
             assert detect_system_language() == "tr_{}.qm".format(locale)