From 7160eb600a8619930c04df56702ed6658712e248 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 30 Jul 2015 15:51:41 +0200 Subject: [PATCH] translation: Load msgmerge path from config or default to /usr/bin/env msgmerge refs #9615 --- .../library/Translation/Util/GettextTranslationHelper.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php index 53f9aff17..d4742e7d0 100644 --- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php +++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php @@ -242,7 +242,12 @@ class GettextTranslationHelper private function updateTranslationTable() { if (is_file($this->tablePath)) { - shell_exec(sprintf('/usr/bin/msgmerge --update %s %s 2>&1', $this->tablePath, $this->templatePath)); + shell_exec(sprintf( + '%s --update %s %s 2>&1', + $this->getConfig()->get('translation', 'msgmerge', '/usr/bin/env php'), + $this->tablePath, + $this->templatePath + )); } else { if ((!is_dir(dirname($this->tablePath)) && !@mkdir(dirname($this->tablePath), 0755, true)) || !rename($this->templatePath, $this->tablePath)) {