diff options
| author |  zoidberg10 <zoidberg@mujmail.cz>
| 2011-12-08 02:08:35 +0100 |
|---|---|---|
| committer | zoidberg10 <zoidberg@mujmail.cz>
| 2011-12-08 02:08:35 +0100 |
| commit | 30ba647fe479d86c3d7bac71908ee56ec80eb928 (patch) | |
| tree | 765c5e0295d81f712e070da774d591561848f34b /module/web | |
| parent | httprequest: encode('utf_8') for unicode post (diff) | |
| parent | updated bottle.py (diff) | |
| download | pyload-30ba647fe479d86c3d7bac71908ee56ec80eb928.tar.xz | |
Merge
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/pyload_app.py | 2 | ||||
| -rw-r--r-- | module/web/webinterface.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py index e6c9ab436..9612e495e 100644 --- a/module/web/pyload_app.py +++ b/module/web/pyload_app.py @@ -381,7 +381,7 @@ def path(file="", path=""): @route("/logs", method="POST") @route("/logs/:item") @route("/logs/:item", method="POST") -@login_required('STATUS') +@login_required('LOGS') def logs(item=-1): s = request.environ.get('beaker.session') diff --git a/module/web/webinterface.py b/module/web/webinterface.py index 68724e3f6..ec8b2e56c 100644 --- a/module/web/webinterface.py +++ b/module/web/webinterface.py @@ -18,8 +18,9 @@ """ import sys -import gettext +import module.common.pylgettext as gettext +import os from os.path import join, abspath, dirname, exists from os import makedirs @@ -98,8 +99,9 @@ if PREFIX: else: env.filters["url"] = lambda x: PREFIX + x if x.startswith("/") else x +gettext.setpaths([join(os.sep, "usr", "share", "pyload", "locale"), None]) translation = gettext.translation("django", join(PYLOAD_DIR, "locale"), - languages=["en", config.get("general", "language")]) + languages=[config.get("general", "language"), "en"],fallback=True) translation.install(True) env.install_gettext_translations(translation) |