From 85a7ffc8ebe601607a4b63cbad8d651b585d6bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= Date: Mon, 16 Mar 2015 19:24:27 -0600 Subject: [PATCH] German and croatian are added to language handler, message logs format has changed to partially fix #5 --- src/languageHandler.py | 4 +++- src/logger.py | 6 +++--- src/sound_lib/stream.py | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/languageHandler.py b/src/languageHandler.py index 9b559a45..34a1d1d5 100644 --- a/src/languageHandler.py +++ b/src/languageHandler.py @@ -165,7 +165,7 @@ def setLanguage(lang): trans=gettext.translation("twblue",fallback=True) curLang="en" trans.install(unicode=True) - log.debug("Current language: %s" % (curLang,)) +# log.debug(u"Current language: %s" % (curLang,)) # Install our pgettext function. # __builtin__.__dict__["pgettext"] = makePgettext(trans) @@ -191,11 +191,13 @@ def langToWindowsLocale(lang): languages = {"en": "eng", "ar": "ara", "ca": "cat", + "de": "deu", "es": "esp", "fi": "fin", "fr": "fre_FRA", "gl": "glc", "eu": "euq", + "hr": "hrv", "hu": "hun", "it": "ita", "pl": "plk", diff --git a/src/logger.py b/src/logger.py index 8bb5dbd8..4820a28e 100644 --- a/src/logger.py +++ b/src/logger.py @@ -6,10 +6,10 @@ import sys APP_LOG_FILE = 'debug.log' ERROR_LOG_FILE = "error.log" -MESSAGE_FORMAT = u"%(asctime)s %(name)s %(levelname)s: %(message)s" -DATE_FORMAT = u"%b %d, %Y %H:%M:%S" +MESSAGE_FORMAT = "%(asctime)s %(name)s %(levelname)s: %(message)s" +DATE_FORMAT = u"%d/%m/%Y %H:%M:%S" -formatter = logging.Formatter(MESSAGE_FORMAT, datefmt=DATE_FORMAT) +formatter = logging.Formatter(MESSAGE_FORMAT.decode("utf-8"), datefmt=DATE_FORMAT) requests_log = logging.getLogger("requests") requests_log.setLevel(logging.WARNING) diff --git a/src/sound_lib/stream.py b/src/sound_lib/stream.py index ecba3da9..8e0ca0aa 100644 --- a/src/sound_lib/stream.py +++ b/src/sound_lib/stream.py @@ -59,4 +59,3 @@ class URLStream(BaseStream): flags = flags | self.flags_for(three_d=three_d, autofree=autofree, decode=decode) handle = bass_call(BASS_StreamCreateURL, url, offset, flags, self.downloadproc, user) super(URLStream, self).__init__(handle) -