new locale

4 files changed, 8 insertions, 7 deletions

diff --git a/module/PluginThread.py b/module/PluginThread.py
index 296b51bb3..3ee299f72 100644
--- a/module/PluginThread.py
+++ b/module/PluginThread.py
@@ -214,8 +214,8 @@ class DownloadThread(PluginThread):
                 code, msg = e
 
 
-                if code in (7,52,56,28):
-                    self.m.log.warning(_("Couldn't connect to host waiting 1 minute and retry."))
+                if code in (7, 18, 28, 52, 56):
+                    self.m.log.warning(_("Couldn't connect to host or connection resetted waiting 1 minute and retry."))
                     wait = time() + 60
                     while time() < wait:
                         sleep(1)
diff --git a/module/network/Request.py b/module/network/Request.py
index 03b69f528..f9941d74c 100755
--- a/module/network/Request.py
+++ b/module/network/Request.py
@@ -89,8 +89,8 @@ class Request:
         self.pycurl.setopt(pycurl.HEADERFUNCTION, self.write_header)
         #self.pycurl.setopt(pycurl.BUFFERSIZE, self.bufferSize)
         self.pycurl.setopt(pycurl.SSL_VERIFYPEER, 0)
-        self.pycurl.setopt(pycurl.LOW_SPEED_TIME, 20)
-        self.pycurl.setopt(pycurl.LOW_SPEED_LIMIT, 100)
+        self.pycurl.setopt(pycurl.LOW_SPEED_TIME, 30)
+        self.pycurl.setopt(pycurl.LOW_SPEED_LIMIT, 20)
         
         if self.debug:
             self.pycurl.setopt(pycurl.VERBOSE, 1)
diff --git a/module/plugins/Account.py b/module/plugins/Account.py
index d0beaa8dc..19ab8f4ba 100644
--- a/module/plugins/Account.py
+++ b/module/plugins/Account.py
@@ -47,11 +47,11 @@ class Account():
         try:
             self.login(user, data)
         except WrongPassword:
-            self.core.log.warning(_("Could not login with %s account %s | %s") % (self.__name__, user, _("Wrong Password")))
+            self.core.log.warning(_("Could not login with %(plugin)s account %(user)s | %(msg)s") % {"plugin": self.__name__, "user": user, "msg": _("Wrong Password")})
             data["valid"] = False
 
         except Exception, e:
-            self.core.log.warning(_("Could not login with %s account %s | %s") % (self.__name__, user, e))
+            self.core.log.warning(_("Could not login with %(plugin)s account %(user)s | %(msg)s") % {"plugin" :self.__name__, "user": user, "msg": e})
             data["valid"] = False
             if self.core.debug:
                 print_exc()
diff --git a/module/web/settings.py b/module/web/settings.py
index 4dfe50fdc..c087cc6bf 100644
--- a/module/web/settings.py
+++ b/module/web/settings.py
@@ -27,7 +27,6 @@ sys.path.append(pypath)
 config = None

 #os.chdir(PROJECT_DIR) # UNCOMMENT FOR LOCALE GENERATION

 

-#DEBUG = config.get("general","debug")

 

 try:

     import module.web.ServerThread

@@ -55,6 +54,8 @@ except:
 

     PYLOAD = xmlrpclib.ServerProxy(server_url, allow_none=True)

 

+DEBUG = config.get("general","debug_mode")

+

 from module.JsEngine import JsEngine

 JS = JsEngine()