summaryrefslogtreecommitdiffstats
path: root/deluge/ui/web/server.py
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2019-05-10 12:58:33 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2019-05-11 20:40:20 +0100
commitd417c4b0f9fd0702ebf986546ab884d2a9517e4e (patch)
tree15c9d05c71f87bd3fc777359abff7119e2cc2934 /deluge/ui/web/server.py
parent653f80eac8593703bda727ca85d955dd1973ca1a (diff)
downloaddeluge-d417c4b0f9fd0702ebf986546ab884d2a9517e4e.tar.gz
deluge-d417c4b0f9fd0702ebf986546ab884d2a9517e4e.tar.bz2
deluge-d417c4b0f9fd0702ebf986546ab884d2a9517e4e.zip
[Core] Refactor the base argparser and translation code.
- Move baseargparser out of deluge/ui since it is also used by the Daemon and could cause packaging issues if UI code is not available. - Renamed baseargparser to argparserbase to follow existing Deluge naming. - Renamed get_version to distinguish from deluge.common.get_version. - Translation code is usable by more than just the UIs so also move it to Deluge namespace and re-use i18n directory and make it a package. - Renamed setup_translations to singular as it felt more correct. - Renamed set_dummy_trans to be more descriptive. Closes: #3081
Diffstat (limited to 'deluge/ui/web/server.py')
-rw-r--r--deluge/ui/web/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index ebb92151a..c8f901a5a 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -25,8 +25,8 @@ from deluge import common, component, configmanager
from deluge.common import is_ipv6
from deluge.core.rpcserver import check_ssl_keys
from deluge.crypto_utils import get_context_factory
+from deluge.i18n import set_language, setup_translation
from deluge.ui.tracker_icons import TrackerIcons
-from deluge.ui.translations_util import set_language, setup_translations
from deluge.ui.web.auth import Auth
from deluge.ui.web.common import Template
from deluge.ui.web.json_api import JSON, WebApi, WebUtils
@@ -687,7 +687,7 @@ class DelugeWeb(component.Component):
# Strip away slashes and serve on the base path as well as root path
self.top_level.putChild(self.base.strip('/'), self.top_level)
- setup_translations()
+ setup_translation()
# Remove twisted version number from 'server' http-header for security reasons
server.version = 'TwistedWeb'