tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-29 08:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix PHP warning on Windows due to LC_MESSAGES not defined

Browse Source 
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Don't define LC_MESSAGES globally as only 2 methods would need that
Use LC_ALL rather than 6

fixes #8912
This commit is contained in:
Paul Richards 2015-03-30 21:42:29 +01:00 committed by Alexander A. Klimov
parent 7ea6eeb20d
commit e8cdcce61d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -18,6 +18,7 @@ Marius Hein <marius.hein@netways.de>
Markus Frosch <markus@lazyfrosch.de> Markus Frosch <markus@lazyfrosch.de>
Matthias Jentsch <matthias.jentsch@netways.de> Matthias Jentsch <matthias.jentsch@netways.de>
Michael Friedrich <michael.friedrich@netways.de> Michael Friedrich <michael.friedrich@netways.de>
Paul Richards <paul@minimoo.org>
Rene Moser <rene.moser@swisstxt.ch> Rene Moser <rene.moser@swisstxt.ch>
Susanne Vestner-Ludwig <susanne.vestner-ludwig@inserteffect.com> Susanne Vestner-Ludwig <susanne.vestner-ludwig@inserteffect.com>
Sylph Lin <sylph.lin@gmail.com> Sylph Lin <sylph.lin@gmail.com>

14
library/Icinga/Util/Translator.php
View File

@ -100,7 +100,11 @@ class Translator
{ {
$contextString = "{$context}\004{$text}"; $contextString = "{$context}\004{$text}";
$translation = dcgettext($domain, $contextString, LC_MESSAGES); $translation = dcgettext(
$domain,
$contextString,
defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL
);
if ($translation == $contextString) { if ($translation == $contextString) {
return $text; return $text;
@ -126,7 +130,13 @@ class Translator
{ {
$contextString = "{$context}\004{$textSingular}"; $contextString = "{$context}\004{$textSingular}";
$translation = dcngettext($domain, $contextString, $textPlural, $number, LC_MESSAGES); $translation = dcngettext(
$domain,
$contextString,
$textPlural,
$number,
defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL
);
if ($translation == $contextString || $translation == $textPlural) { if ($translation == $contextString || $translation == $textPlural) {
return ($number == 1 ? $textSingular : $textPlural); return ($number == 1 ? $textSingular : $textPlural);