Happy new Year !!!

6 files changed, 17 insertions, 11 deletions

diff --git a/locale/django.pot b/locale/django.pot
index 67e0ec214..7dcd8f378 100644
--- a/locale/django.pot
+++ b/locale/django.pot
@@ -214,7 +214,7 @@ msgid "Reload page"
 msgstr ""
 
 #: templates/default/base.html:302
-msgid "© 2008-2010 the pyLoad Team"
+msgid "© 2008-2011 the pyLoad Team"
 msgstr ""
 
 #: templates/default/base.html:304
diff --git a/module/ConfigParser.py b/module/ConfigParser.py
index ccf6f08d1..0d681551a 100644
--- a/module/ConfigParser.py
+++ b/module/ConfigParser.py
@@ -325,7 +325,11 @@ class ConfigParser:
         
         self.plugin[plugin][option]["value"] = value
         self.save()
-        
+
+    def getMetaData(self, section, option):
+        """ get all config data for an option """
+        return self.config[section][option]
+
     #----------------------------------------------------------------------
     def addPluginConfig(self, config):
         """adds config option with tuple (plugin, name, type, desc, default)"""
diff --git a/module/setup.py b/module/setup.py
index 8881cf055..7799ea30c 100644
--- a/module/setup.py
+++ b/module/setup.py
@@ -261,12 +261,14 @@ class Setup():
         self.config.password = self.ask("", "", password=True)
 
         print ""
-        self.config["general"]["language"] = self.ask(_("Language"), "en", ["en", "de", "it", "pl", "es"])
-        #@TODO get language from config type
+        langs = self.config.getMetaData("general", "language")
+        self.config["general"]["language"] = self.ask(_("Language"), "en", langs["type"].split(";"))
+
+        
         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.")
-        self.config["general"]["checksum"] = self.ask(_("Proof checksum?"), "y", bool=True)
+        self.config["download"]["max_downloads"] = self.ask(_("Max parallel downloads"), "3")
+        #print _("You should disable checksum proofing, if you have low hardware requirements.")
+        #self.config["general"]["checksum"] = self.ask(_("Proof checksum?"), "y", bool=True)
 
         reconnect = self.ask(_("Use Reconnect?"), "n", bool=True)
         self.config["reconnect"]["activated"] = reconnect
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 8cd44615d..9b9622a12 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -300,7 +300,7 @@ function AddBox()
 

 	<hr style="clear: both;" />

 

-<div id="foot">{% trans "© 2008-2010 the pyLoad Team" %}

+<div id="foot">{% trans "© 2008-2011 the pyLoad Team" %}

 

 	<a href="#top" class="action top" accesskey="x"><span>{% trans "Back to top" %}</span></a><br />

 	<!--<div class="breadcrumbs"></div>-->

diff --git a/pyLoadCli.py b/pyLoadCli.py
index e8fc57160..3a1a13384 100755
--- a/pyLoadCli.py
+++ b/pyLoadCli.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-#Copyright (C) 2010 RaNaN
+#Copyright (C) 2011 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
@@ -448,7 +448,7 @@ def white(string):
 
 def print_help():
     print ""
-    print "pyLoadCli Copyright (c) 2008-2010 the pyLoad Team"
+    print "pyLoadCli Copyright (c) 2008-2011 the pyLoad Team"
     print ""
     print "Usage: [python] pyLoadCli.py [options] [server url]"
     print ""
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 3349a7393..eb990bab7 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -142,7 +142,7 @@ class Core(object):
 
     def print_help(self):
         print ""
-        print "pyLoad %s  Copyright (c) 2008-2010 the pyLoad Team" % CURRENT_VERSION
+        print "pyLoad %s  Copyright (c) 2008-2011 the pyLoad Team" % CURRENT_VERSION
         print ""
         print "Usage: [python] pyLoadCore.py [options]"
         print ""