diff options
Diffstat (limited to 'module/setup.py')
-rw-r--r-- | module/setup.py | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/module/setup.py b/module/setup.py index f90afe23a..d16b8c9e2 100644 --- a/module/setup.py +++ b/module/setup.py @@ -41,15 +41,15 @@ class Setup(): self.stdin_encoding = get_console_encoding(sys.stdin.encoding) def start(self): - langs = self.config.getMetaData("general", "language")["type"].split(";") + langs = self.config.getMetaData("general", "language").type.split(";") lang = self.ask(u"Choose your Language / Wähle deine Sprache", "en", langs) gettext.setpaths([join(os.sep, "usr", "share", "pyload", "locale"), None]) translation = gettext.translation("setup", join(self.path, "locale"), languages=[lang, "en"], fallback=True) translation.install(True) - #Input shorthand for yes + #l10n Input shorthand for yes self.yes = _("y") - #Input shorthand for no + #l10n Input shorthand for no self.no = _("n") # print "" @@ -82,7 +82,7 @@ class Setup(): print _("When you are ready for system check, hit enter.") raw_input() - basic, ssl, captcha, gui, web, js = self.system_check() + basic, ssl, captcha, web, js = self.system_check() print "" if not basic: @@ -101,7 +101,6 @@ class Setup(): if self.check_module("Crypto"): avail.append(_("container decrypting")) if ssl: avail.append(_("ssl connection")) if captcha: avail.append(_("automatic captcha decryption")) - if gui: avail.append(_("GUI")) if web: avail.append(_("Webinterface")) if js: avail.append(_("extended Click'N'Load")) @@ -133,11 +132,6 @@ class Setup(): print _("Only needed for some hosters and as freeuser.") print "" - if not gui: - print _("Gui not available") - print _("The Graphical User Interface.") - print "" - if not js: print _("no JavaScript engine found") print _("You will need this for some Click'N'Load links. Install Spidermonkey, ossp-js, pyv8 or rhino") @@ -232,10 +226,6 @@ class Setup(): print "" - gui = self.check_module("PyQt4") - self.print_dep("PyQt4", gui) - - print "" jinja = True try: @@ -263,7 +253,7 @@ class Setup(): js = True if JsEngine.ENGINE else False self.print_dep(_("JS engine"), js) - return basic, ssl, captcha, gui, web, js + return basic, ssl, captcha, web, js def conf_basic(self): print "" @@ -288,7 +278,7 @@ class Setup(): print "" langs = self.config.getMetaData("general", "language") - self.config["general"]["language"] = self.ask(_("Language"), "en", langs["type"].split(";")) + self.config["general"]["language"] = self.ask(_("Language"), "en", langs.type.split(";")) self.config["general"]["download_folder"] = self.ask(_("Downloadfolder"), "Downloads") self.config["download"]["max_downloads"] = self.ask(_("Max parallel downloads"), "3") @@ -496,10 +486,10 @@ class Setup(): input = default if bool: - # yes, true,t are inputs for booleans with value true + #l10n yes, true,t are inputs for booleans with value true if input.lower().strip() in [self.yes, _("yes"), _("true"), _("t"), "yes"]: return True - # no, false,f are inputs for booleans with value false + #l10n no, false,f are inputs for booleans with value false elif input.lower().strip() in [self.no, _("no"), _("false"), _("f"), "no"]: return False else: |