summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-07-08 20:41:12 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2018-07-09 16:43:31 +0200
commitc8d99bac8ef96ac94bccdf3c754e7d43b3f1703c (patch)
tree751dfc8c144bb27f6128bc519b050a3e7d38660c
parent2c03766841d9fc103f538d664ec964bc5389f1a2 (diff)
downloadaur-c8d99bac8ef96ac94bccdf3c754e7d43b3f1703c.tar.gz
aur-c8d99bac8ef96ac94bccdf3c754e7d43b3f1703c.tar.xz
Fix regression in translating anything at all
In commit 840ee20 (Rename translation resources from aur to aurweb, 2018-07-07) the translations file was renamed but we never actually switched to using the renamed translations. As a result, every single push to the AUR contains the following traceback: remote: Traceback (most recent call last): remote: File "/usr/bin/aurweb-notify", line 11, in <module> remote: load_entry_point('aurweb==4.7.0', 'console_scripts', 'aurweb-notify')() remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 541, in main remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 69, in send remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 56, in get_body_fmt remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 192, in get_body remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/l10n.py", line 14, in translate remote: File "/usr/lib/python3.6/gettext.py", line 514, in translation remote: raise OSError(ENOENT, 'No translation file found for domain', domain) remote: FileNotFoundError: [Errno 2] No translation file found for domain: 'aur' Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
-rw-r--r--aurweb/l10n.py2
-rw-r--r--web/lib/translator.inc.php3
2 files changed, 2 insertions, 3 deletions
diff --git a/aurweb/l10n.py b/aurweb/l10n.py
index e58e3fe2..66e0f1c0 100644
--- a/aurweb/l10n.py
+++ b/aurweb/l10n.py
@@ -9,7 +9,7 @@ class Translator:
if lang == 'en':
return s
if lang not in self._translator:
- self._translator[lang] = gettext.translation("aur",
+ self._translator[lang] = gettext.translation("aurweb",
"../../web/locale",
languages=[lang])
self._translator[lang].install()
diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php
index d10f8e90..cd944c56 100644
--- a/web/lib/translator.inc.php
+++ b/web/lib/translator.inc.php
@@ -131,9 +131,8 @@ function set_lang() {
}
$streamer = new FileReader('../locale/' . $LANG .
- '/LC_MESSAGES/aur.mo');
+ '/LC_MESSAGES/aurweb.mo');
$l10n = new gettext_reader($streamer, true);
return;
}
-