| Message ID | 20180708184112.10452-1-eschwartz@archlinux.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Sun, 08 Jul 2018 at 20:41:12, Eli Schwartz wrote: > In commit 840ee20f7b9327fd5e3445af2652b299fdd0ff7f 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> > --- > > v2: fix PHP code too > > aurweb/l10n.py | 2 +- > web/lib/translator.inc.php | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) Merged, thanks!
diff --git a/aurweb/l10n.py b/aurweb/l10n.py index e58e3fe..66e0f1c 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 d10f8e9..cd944c5 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; } -
In commit 840ee20f7b9327fd5e3445af2652b299fdd0ff7f 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> --- v2: fix PHP code too aurweb/l10n.py | 2 +- web/lib/translator.inc.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)