l10n quality fixes

src/l10n.py

@@ -1,4 +1,6 @@
-
+"""
+Localization
+"""
 import logging
 import os
 import time
@@ -78,13 +80,17 @@ if time_format != DEFAULT_TIME_FORMAT:
         time_format = DEFAULT_TIME_FORMAT
         encoding = DEFAULT_ENCODING
 
+
 def setlocale(category, newlocale):
+    """Set the locale"""
     locale.setlocale(category, newlocale)
     # it looks like some stuff isn't initialised yet when this is called the
     # first time and its init gets the locale settings from the environment
     os.environ["LC_ALL"] = newlocale
 
+
 def formatTimestamp(timestamp=None, as_unicode=True):
+    """Return a formatted timestamp"""
     # For some reason some timestamps are strings so we need to sanitize.
     if timestamp is not None and not isinstance(timestamp, int):
         try:
@@ -109,17 +115,21 @@ def formatTimestamp(timestamp = None, as_unicode = True):
         return unicode(timestring, encoding)
     return timestring
 
+
 def getTranslationLanguage():
-    userlocale = None
-    if BMConfigParser().has_option('bitmessagesettings', 'userlocale'):
-        userlocale = BMConfigParser().get('bitmessagesettings', 'userlocale')
+    """Return the user's language choice"""
+    userlocale = BMConfigParser().safeGet(
+        'bitmessagesettings', 'userlocale', 'system')
+    return userlocale if userlocale and userlocale != 'system' else language
 
-    if userlocale in [None, '', 'system']:
-        return language
-
-    return userlocale
 
 def getWindowsLocale(posixLocale):
+    """
+    Get the Windows locale
+    Technically this converts the locale string from UNIX to Windows format,
+    because they use different ones in their
+    libraries. E.g. "en_EN.UTF-8" to "english".
+    """
     if posixLocale in windowsLanguageMap:
         return windowsLanguageMap[posixLocale]
     if "." in posixLocale: