From b58ffbe0341291fb19d351e8c6586ca1df9c24f9 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 12 Jun 2015 13:29:31 +0200 Subject: [PATCH] Revert "Translator: fall back to LC_ALL if LC_MESSAGES is not defined" This reverts commit 9fe2d4928d2542348a0e6932951628588875396c. --- library/Icinga/Util/Translator.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/library/Icinga/Util/Translator.php b/library/Icinga/Util/Translator.php index 03fd865cd..67825b63b 100644 --- a/library/Icinga/Util/Translator.php +++ b/library/Icinga/Util/Translator.php @@ -100,11 +100,7 @@ class Translator { $contextString = "{$context}\004{$text}"; - $translation = dcgettext( - $domain, - $contextString, - defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL - ); + $translation = dcgettext($domain, $contextString, LC_MESSAGES); if ($translation == $contextString) { return $text; @@ -130,13 +126,7 @@ class Translator { $contextString = "{$context}\004{$textSingular}"; - $translation = dcngettext( - $domain, - $contextString, - $textPlural, - $number, - defined('LC_MESSAGES') ? LC_MESSAGES : LC_ALL - ); + $translation = dcngettext($domain, $contextString, $textPlural, $number, LC_MESSAGES); if ($translation == $contextString || $translation == $textPlural) { return ($number == 1 ? $textSingular : $textPlural);