summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Core.py37
-rw-r--r--config14
-rw-r--r--locale/de/LC_MESSAGES/pyLoad.mobin1018 -> 1125 bytes
-rw-r--r--locale/de/de.po44
4 files changed, 51 insertions, 44 deletions
diff --git a/Core.py b/Core.py
index 1d7e1e436..d76c4fba7 100644
--- a/Core.py
+++ b/Core.py
@@ -53,7 +53,7 @@ class Core(object):
self.read_config()
- translation = gettext.translation("pyLoad", "locale", ["de"])
+ translation = gettext.translation("pyLoad", "locale", languages=[self.config['language']])
translation.install(unicode=True)
print _("Downloadtime:"), self.is_dltime() # debug only
@@ -80,13 +80,14 @@ class Core(object):
for section in config.sections():
for option in config.options(section):
self.config[option] = config.get(section, option)
- self.config[option] = False if self.config[option].lower == 'False' else self.config[option]
-
- self.config['download_folder'] = config.get('general', 'downloadFolder')
- self.config['link_file'] = config.get('general', 'linkFile')
- self.config['search_updates'] = config.getboolean('updates', 'searchUpdates')
- self.config['log_folder'] = config.get('log', 'logFolder')
- self.config['reconnectMethod'] = config.get('general', 'reconnectMethod')
+ self.config[option] = False if self.config[option].lower() == 'false' else self.config[option]
+
+ self.config['language'] = config.get('general', 'language')
+ self.config['download_folder'] = config.get('general', 'download_folder')
+ self.config['link_file'] = config.get('general', 'link_file')
+ self.config['search_updates'] = config.getboolean('updates', 'search_updates')
+ self.config['log_folder'] = config.get('log', 'log_folder')
+ self.config['reconnectMethod'] = config.get('general', 'reconnect_method')
def create_plugin_index(self):
for file_handler in glob(self.config['plugin_folder'] + sep + '*.py'):
@@ -99,7 +100,7 @@ class Core(object):
if plugin_pattern != "":
self.plugins_avaible[plugin_file] = plugin_pattern
self.logger.debug(plugin_file + _(" added"))
- print _("created index of plugins")
+ self.logger.debug(_("created index of plugins"))
## def check_needed_plugins(self):
## links = open(self.link_file, 'r').readlines()
@@ -145,11 +146,11 @@ class Core(object):
"""
newst_version = urllib2.urlopen("http://pyload.nady.biz/files/version.txt").readline().strip()
if CURRENT_VERSION < newst_version:
- print _("new update on pyload.de.rw:"), newst_version #newer version out
+ print _("new update %s on pyload.de.rw") % newst_version #newer version out
elif CURRENT_VERSION == newst_version:
- print _("newst update in use:"), CURRENT_VERSION #using newst version
+ print _("newst version %s in use:") % CURRENT_VERSION #using newst version
else:
- print _("beta version in use:"), CURRENT_VERSION #using beta version
+ print _("beta version %s in use:") % CURRENT_VERSION #using beta version
def check_create(self, check_name, legend, folder=True):
if not exists(check_name):
@@ -158,9 +159,9 @@ class Core(object):
mkdir(check_name)
else:
open(check_name, "w")
- print legend, _("created")
+ self.logger.debug(legend, _("created"))
except:
- print _("could not create "), legend
+ self.logger.debug(_("could %s not create ") % legend)
exit()
#def addLinks(self, newLinks, atTheBeginning):
@@ -175,7 +176,6 @@ class Core(object):
# #logger: kein plugin gefunden
# return None
-
def __new_py_load_file(self, url):
new_file = PyLoadFile(self, url)
new_file.download_folder = self.config['download_folder']
@@ -223,7 +223,6 @@ class Core(object):
return list
-
def _test_print_status(self):
if self.thread_list.py_downloading:
@@ -248,9 +247,9 @@ class Core(object):
if __name__ == "__main__":
testLoader = Core()
- if testLoader.config['remoteactivated']:
- print "Server Mode"
+ if testLoader.config['remote_activated']:
+ print _("Server Mode")
server = ServerThread(testLoader)
- server.start()
+ server.start()
testLoader.start()
diff --git a/config b/config
index b5a790250..fb6db7792 100644
--- a/config
+++ b/config
@@ -1,17 +1,19 @@
[general]
-downloadFolder = Downloads
-linkFile = links.txt
+#use de or en
+language: de
+download_folder = Downloads
+link_file = links.txt
useReconnect = False
-reconnectMethod = ./reconnect.sh
+reconnect_method = ./reconnect.sh
[updates]
-searchUpdates = True
+search_updates = True
[log]
-logFolder = Logs
+log_folder = Logs
fullLog = True
[time]
start = 0:00
end = 6:00
[remote]
-remoteActivated = False
+remote_activated = False
port = 7272
remotePassword = pwhere
diff --git a/locale/de/LC_MESSAGES/pyLoad.mo b/locale/de/LC_MESSAGES/pyLoad.mo
index 71cc7015d..97816423e 100644
--- a/locale/de/LC_MESSAGES/pyLoad.mo
+++ b/locale/de/LC_MESSAGES/pyLoad.mo
Binary files differ
diff --git a/locale/de/de.po b/locale/de/de.po
index d0be50647..9693e074b 100644
--- a/locale/de/de.po
+++ b/locale/de/de.po
@@ -5,14 +5,16 @@
msgid ""
msgstr ""
"Project-Id-Version: pyLoad 0.1\n"
-"POT-Creation-Date: 2009-05-29 00:48+CEST\n"
-"PO-Revision-Date: 2009-05-29 15:30+0100\n"
+"POT-Creation-Date: 2009-05-30 20:15+CEST\n"
+"PO-Revision-Date: 2009-05-30 20:19+0100\n"
"Last-Translator: spoob <spoob@gmx.de>\n"
"Language-Team: pyLoad <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: Germany\n"
#: Core.py:59
msgid "Downloadtime:"
@@ -28,33 +30,37 @@ msgstr "Ordner für Logs"
#: Core.py:65
msgid "file for links"
-msgstr "Datei für Link"
+msgstr "Datei für Links"
-#: Core.py:100
+#: Core.py:102
msgid " added"
msgstr " hinzugefügt"
-#: Core.py:101
+#: Core.py:103
msgid "created index of plugins"
-msgstr "Index der Plugins erstellt"
-
-#: Core.py:147
-msgid "new update on pyload.de.rw:"
-msgstr "Neues Update auf pyload.de.rw"
+msgstr "Plugin Index erstellt"
#: Core.py:149
-msgid "newst update in use:"
-msgstr "Neustes Update in Benutzung:"
+msgid "new update %s on pyload.de.rw"
+msgstr "Neues Update %s auf pyload.tk"
#: Core.py:151
-msgid "beta version in use:"
-msgstr "Beta Version in Benutzung"
+msgid "newst version %s in use:"
+msgstr "Neuste Version %s in benutzung"
+
+#: Core.py:153
+msgid "beta version %s in use:"
+msgstr "Beta Version %s in benutzung"
-#: Core.py:160
+#: Core.py:162
msgid "created"
msgstr "erstellt"
-#: Core.py:162
-msgid "could not create "
-msgstr "Konnte nicht erstellen "
+#: Core.py:164
+msgid "could %s not create "
+msgstr "Konnte %s nicht erstellen"
+
+#: Core.py:252
+msgid "Server Mode"
+msgstr "Server Modus"
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 03:07:51 +0100