From 570da31e3a030b25e84721348fe14b362c7eb513 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 3 Feb 2010 17:33:28 +0100 Subject: l18n fixes --- module/web/settings.py | 2 +- pyLoadCli.py | 8 +++----- systemCheck.py | 4 +++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/web/settings.py b/module/web/settings.py index 2199ab221..dfde88f5c 100644 --- a/module/web/settings.py +++ b/module/web/settings.py @@ -64,7 +64,7 @@ TIME_ZONE = 'Europe' # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'en' +LANGUAGE_CODE = config.get("general","language") SITE_ID = 1 diff --git a/pyLoadCli.py b/pyLoadCli.py index 1989163c2..99d121d02 100755 --- a/pyLoadCli.py +++ b/pyLoadCli.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -#Copyright (C) 2009 RaNaN +#Copyright (C) 2010 RaNaN # #This program is free software; you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by @@ -430,7 +430,7 @@ if __name__ == "__main__": xmlconfig = XMLConfigParser(join(abspath(dirname(__file__)), "module", "config", "core.xml")) config = xmlconfig.getConfig() - translation = gettext.translation("pyLoad", join(abspath(dirname(__file__)), "locale"), languages=[config['general']['language']]) + translation = gettext.translation("pyLoadCli", join(abspath(dirname(__file__)), "locale"), languages=[config['general']['language']]) translation.install(unicode=True) if len(sys.argv) > 1: @@ -441,9 +441,7 @@ if __name__ == "__main__": opts, extraparams = __import__("getopt").getopt(sys.argv[1:], shortOptions, longOptions) for option, params in opts: if option in ("-l", "--local"): - - - + ssl = "" if config['ssl']['activated'] == "True": ssl = "s" diff --git a/systemCheck.py b/systemCheck.py index 6477097b0..2c4946525 100644 --- a/systemCheck.py +++ b/systemCheck.py @@ -155,4 +155,6 @@ def main(): print "No Problems detected, Webinterface should work fine." if __name__ == "__main__": - main() \ No newline at end of file + main() + + raw_input("Press Enter to Exit.") \ No newline at end of file -- cgit v1.2.3