diff options
| author | Lukas Fleischer <lfleischer@archlinux.org> | 2018-07-22 10:41:57 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@archlinux.org> | 2018-08-06 06:03:52 +0200 |
| commit | a7865ef5aa0309976b5dd2642210632babe106d9 (patch) | |
| tree | 457e0841021b4a8ca129de02674f86de1bfc50af | |
| parent | c8d99bac8ef96ac94bccdf3c754e7d43b3f1703c (diff) | |
| download | aur-a7865ef5aa0309976b5dd2642210632babe106d9.tar.gz aur-a7865ef5aa0309976b5dd2642210632babe106d9.tar.xz | |
Make the locale directory configurable
Add a new configuration option to specify the locale directory to use.
This allows the Python scripts to find the translations, even when not
being run from the source code checkout. At the same time, multiple
parallel aurweb setups can still use different sets of translations.
Fixes FS#59278.
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
| -rw-r--r-- | aurweb/l10n.py | 5 | ||||
| -rw-r--r-- | conf/config.defaults | 1 | ||||
| -rw-r--r-- | web/lib/translator.inc.php | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/aurweb/l10n.py b/aurweb/l10n.py index 66e0f1c0..a7c0103e 100644 --- a/aurweb/l10n.py +++ b/aurweb/l10n.py @@ -1,8 +1,11 @@ import gettext +import aurweb.config + class Translator: def __init__(self): + self._localedir = aurweb.config.get('options', 'localedir') self._translator = {} def translate(self, s, lang): @@ -10,7 +13,7 @@ class Translator: return s if lang not in self._translator: self._translator[lang] = gettext.translation("aurweb", - "../../web/locale", + self._localedir, languages=[lang]) self._translator[lang].install() return _(s) diff --git a/conf/config.defaults b/conf/config.defaults index be37f430..c8bc3a7e 100644 --- a/conf/config.defaults +++ b/conf/config.defaults @@ -35,6 +35,7 @@ snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz enable-maintenance = 1 maintenance-exceptions = 127.0.0.1 render-comment-cmd = /usr/local/bin/aurweb-rendercomment +localedir = /srv/http/aurweb/aur.git/web/locale/ # memcache or apc cache = none memcache_servers = 127.0.0.1:11211 diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php index cd944c56..334d0e76 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -130,7 +130,8 @@ function set_lang() { setcookie("AURLANG", $LANG, $cookie_time, "/"); } - $streamer = new FileReader('../locale/' . $LANG . + $localedir = config_get('options', 'localedir'); + $streamer = new FileReader($localedir . '/' . $LANG . '/LC_MESSAGES/aurweb.mo'); $l10n = new gettext_reader($streamer, true); |