tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

translation: Load msgmerge path from config or default to /usr/bin/env msgmerge 

refs #9615
This commit is contained in:
Eric Lippmann 2015-07-30 15:51:41 +02:00
parent 219dcdda37
commit 7160eb600a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/translation/library/Translation/Util/GettextTranslationHelper.php
View File

@ -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)) {