From 925fde4260ab5e76820d1bc6a87a372f0a6b42d8 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 6 Sep 2010 12:50:18 +0200 Subject: win fixes, updated locale + pl --- locale/de/LC_MESSAGES/setup.mo | Bin 9471 -> 9471 bytes locale/es/LC_MESSAGES/pyLoad.mo | Bin 356 -> 2069 bytes locale/es/LC_MESSAGES/pyLoadCli.mo | Bin 375 -> 2404 bytes locale/es/LC_MESSAGES/pyLoadGui.mo | Bin 375 -> 2737 bytes locale/es/LC_MESSAGES/setup.mo | Bin 0 -> 462 bytes locale/it/LC_MESSAGES/pyLoad.mo | Bin 9503 -> 10043 bytes locale/it/LC_MESSAGES/pyLoadGui.mo | Bin 3732 -> 4258 bytes locale/it/LC_MESSAGES/setup.mo | Bin 9459 -> 9827 bytes locale/pl/LC_MESSAGES/pyLoad.mo | Bin 4208 -> 10250 bytes locale/pl/LC_MESSAGES/pyLoadCli.mo | Bin 2461 -> 2534 bytes locale/pl/LC_MESSAGES/pyLoadGui.mo | Bin 3147 -> 4317 bytes locale/pl/LC_MESSAGES/setup.mo | Bin 0 -> 10086 bytes module/config/default.conf | 2 +- module/setup.py | 20 ++++++++++++++++---- module/web/locale/es/LC_MESSAGES/django.mo | Bin 367 -> 3698 bytes module/web/locale/pl/LC_MESSAGES/django.mo | Bin 3392 -> 4655 bytes pyLoadCore.py | 8 +++++++- 17 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 locale/es/LC_MESSAGES/setup.mo create mode 100644 locale/pl/LC_MESSAGES/setup.mo diff --git a/locale/de/LC_MESSAGES/setup.mo b/locale/de/LC_MESSAGES/setup.mo index edfb468c1..bcd08890b 100644 Binary files a/locale/de/LC_MESSAGES/setup.mo and b/locale/de/LC_MESSAGES/setup.mo differ diff --git a/locale/es/LC_MESSAGES/pyLoad.mo b/locale/es/LC_MESSAGES/pyLoad.mo index 2c20cfbd4..f1048ae29 100644 Binary files a/locale/es/LC_MESSAGES/pyLoad.mo and b/locale/es/LC_MESSAGES/pyLoad.mo differ diff --git a/locale/es/LC_MESSAGES/pyLoadCli.mo b/locale/es/LC_MESSAGES/pyLoadCli.mo index 1ae24953f..29b7b0a20 100644 Binary files a/locale/es/LC_MESSAGES/pyLoadCli.mo and b/locale/es/LC_MESSAGES/pyLoadCli.mo differ diff --git a/locale/es/LC_MESSAGES/pyLoadGui.mo b/locale/es/LC_MESSAGES/pyLoadGui.mo index 1ae24953f..8bb38d771 100644 Binary files a/locale/es/LC_MESSAGES/pyLoadGui.mo and b/locale/es/LC_MESSAGES/pyLoadGui.mo differ diff --git a/locale/es/LC_MESSAGES/setup.mo b/locale/es/LC_MESSAGES/setup.mo new file mode 100644 index 000000000..6a7049a52 Binary files /dev/null and b/locale/es/LC_MESSAGES/setup.mo differ diff --git a/locale/it/LC_MESSAGES/pyLoad.mo b/locale/it/LC_MESSAGES/pyLoad.mo index e9b962a65..875793e49 100644 Binary files a/locale/it/LC_MESSAGES/pyLoad.mo and b/locale/it/LC_MESSAGES/pyLoad.mo differ diff --git a/locale/it/LC_MESSAGES/pyLoadGui.mo b/locale/it/LC_MESSAGES/pyLoadGui.mo index a3e589c40..6c12f5e4f 100644 Binary files a/locale/it/LC_MESSAGES/pyLoadGui.mo and b/locale/it/LC_MESSAGES/pyLoadGui.mo differ diff --git a/locale/it/LC_MESSAGES/setup.mo b/locale/it/LC_MESSAGES/setup.mo index eee6aad19..61fdc3214 100644 Binary files a/locale/it/LC_MESSAGES/setup.mo and b/locale/it/LC_MESSAGES/setup.mo differ diff --git a/locale/pl/LC_MESSAGES/pyLoad.mo b/locale/pl/LC_MESSAGES/pyLoad.mo index ccb640f1b..1b7c41d68 100644 Binary files a/locale/pl/LC_MESSAGES/pyLoad.mo and b/locale/pl/LC_MESSAGES/pyLoad.mo differ diff --git a/locale/pl/LC_MESSAGES/pyLoadCli.mo b/locale/pl/LC_MESSAGES/pyLoadCli.mo index f649a4078..00857df3f 100644 Binary files a/locale/pl/LC_MESSAGES/pyLoadCli.mo and b/locale/pl/LC_MESSAGES/pyLoadCli.mo differ diff --git a/locale/pl/LC_MESSAGES/pyLoadGui.mo b/locale/pl/LC_MESSAGES/pyLoadGui.mo index 7d1745301..54545dca0 100644 Binary files a/locale/pl/LC_MESSAGES/pyLoadGui.mo and b/locale/pl/LC_MESSAGES/pyLoadGui.mo differ diff --git a/locale/pl/LC_MESSAGES/setup.mo b/locale/pl/LC_MESSAGES/setup.mo new file mode 100644 index 000000000..68237f4c6 Binary files /dev/null and b/locale/pl/LC_MESSAGES/setup.mo differ diff --git a/module/config/default.conf b/module/config/default.conf index f187e87f0..11cc70388 100644 --- a/module/config/default.conf +++ b/module/config/default.conf @@ -21,7 +21,7 @@ log - "Log": str log_folder : "Folder" = Logs int log_count : "Count" = 5 general - "General": - en;de;it language : "Language" = en + en;de;it;pl;es language : "Language" = en str download_folder : "Download Folder" = Downloads int max_downloads : "Max Parallel Downloads" = 3 bool debug_mode : "Debug Mode" = False diff --git a/module/setup.py b/module/setup.py index 6d4d8e42f..645089a55 100644 --- a/module/setup.py +++ b/module/setup.py @@ -46,7 +46,7 @@ class Setup(): def start(self): - lang = self.ask(u"Choose your Language / Wähle deine Sprache", "en", ["en", "de", "it"]) + lang = self.ask(u"Choose your Language / Wähle deine Sprache", "en", ["en", "de","it","pl"]) translation = gettext.translation("setup", join(self.path, "locale"), languages=["en", lang]) translation.install(True) @@ -259,7 +259,8 @@ class Setup(): self.config.password = self.ask("", "", password=True) print "" - self.config["general"]["language"] = self.ask(_("Language"), "en", ["en", "de", "fr", "nl", "pl"]) + self.config["general"]["language"] = self.ask(_("Language"), "en", ["en", "de", "it", "pl", "es"]) + #@TODO get language from config type self.config["general"]["download_folder"] = self.ask(_("Downloadfolder"), "Downloads") self.config["general"]["max_downloads"] = self.ask(_("Max parallel downloads"), "3") print _("You should disable checksum proofing, if you have low hardware requirements.") @@ -411,13 +412,24 @@ class Setup(): p1 = True p2 = False while p1 != p2: - p1 = getpass(_("Password: ")) + + if os.name == "nt": + qst = str("Password: ") #no unicode on windows + else: + qst = _("Password: ") + + p1 = getpass(qst) if len(p1) < 4: print _("Password to short. Use at least 4 symbols.") continue - p2 = getpass(_("Password (again): ")) + if os.name == "nt": + qst = str("Password (again): ") + else: + qst = _("Password (again): ") + + p2 = getpass(qst) if p1 == p2: return p1 diff --git a/module/web/locale/es/LC_MESSAGES/django.mo b/module/web/locale/es/LC_MESSAGES/django.mo index 3fb287c3d..ea55b4440 100644 Binary files a/module/web/locale/es/LC_MESSAGES/django.mo and b/module/web/locale/es/LC_MESSAGES/django.mo differ diff --git a/module/web/locale/pl/LC_MESSAGES/django.mo b/module/web/locale/pl/LC_MESSAGES/django.mo index 803ca8a68..5f17f785d 100644 Binary files a/module/web/locale/pl/LC_MESSAGES/django.mo and b/module/web/locale/pl/LC_MESSAGES/django.mo differ diff --git a/pyLoadCore.py b/pyLoadCore.py index 30468bac2..d92841d56 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -28,6 +28,7 @@ import gettext from imp import find_module import logging import logging.handlers +import os from os import _exit from os import execv from os import getcwd @@ -65,7 +66,12 @@ from module.web.ServerThread import WebServer from module.FileDatabase import PyFile from codecs import getwriter -sys.stdout = getwriter("utf8")(sys.stdout, errors = "replace") +if os.name == "nt": + enc = "cp850" +else: + enc = "utf8" + +sys.stdout = getwriter(enc)(sys.stdout, errors = "replace") class Core(object): """ pyLoad Core """ -- cgit v1.2.3