From eecb5e04e408a83ade8ef66b2438a2b6167e06d3 Mon Sep 17 00:00:00 2001 From: Et0h Date: Tue, 2 Dec 2014 20:11:18 +0000 Subject: [PATCH] Make FALLBACK_INITIAL_LANGUAGE a constant (default: "en") --- syncplay/constants.py | 1 + syncplay/messages.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/syncplay/constants.py b/syncplay/constants.py index 0db2e43..b06ecde 100644 --- a/syncplay/constants.py +++ b/syncplay/constants.py @@ -15,6 +15,7 @@ SHOW_CONTACT_INFO = True # Displays dev contact details below list in GUI SHOW_BUTTON_LABELS = True # If disabled, only shows icons for main GUI buttons SHOW_TOOLTIPS = True WARN_ABOUT_MISSING_STRINGS = False # (If debug mode is enabled) +FALLBACK_INITIAL_LANGUAGE = "en" #Overriden by config SHOW_OSD = True # Sends Syncplay messages to media player OSD diff --git a/syncplay/messages.py b/syncplay/messages.py index a862f13..8aaa354 100755 --- a/syncplay/messages.py +++ b/syncplay/messages.py @@ -1002,9 +1002,9 @@ def getInitialLanguage(): systemLocale = locale.getdefaultlocale("language")[0] initialLanguage = systemLocale.split("_")[0] if not messages.has_key(systemLocale): - initialLanguage = "en" + initialLanguage = constants.FALLBACK_INITIAL_LANGUAGE except: - initialLanguage = "en" + initialLanguage = constants.FALLBACK_INITIAL_LANGUAGE return initialLanguage def getMessage(type_, locale=None):