From 0def0b373feeb57fe2907838731507154639f713 Mon Sep 17 00:00:00 2001 From: thomas Date: Sun, 13 Jun 2010 14:39:35 +0000 Subject: [PATCH] [I18N] Zend_Filter/Zend_Validate: - fixed behaviour to log on active translation git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22427 44c647ce-9c0f-0410-b52a-842ac1e357ba --- library/Zend/Filter/Input.php | 4 ++-- library/Zend/Validate/Abstract.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/Zend/Filter/Input.php b/library/Zend/Filter/Input.php index 7176e9b43..ee93742a8 100644 --- a/library/Zend/Filter/Input.php +++ b/library/Zend/Filter/Input.php @@ -746,7 +746,7 @@ class Zend_Filter_Input if (null !== ($translator = $this->getTranslator())) { if ($translator->isTranslated($message)) { $message = $translator->translate($message); - } elseif ($translator->isTranslated(self::MISSING_MESSAGE)) { + } else { $message = $translator->translate(self::MISSING_MESSAGE); } } @@ -766,7 +766,7 @@ class Zend_Filter_Input if (null !== ($translator = $this->getTranslator())) { if ($translator->isTranslated($message)) { $message = $translator->translate($message); - } elseif ($translator->isTranslated(self::NOT_EMPTY_MESSAGE)) { + } else { $message = $translator->translate(self::NOT_EMPTY_MESSAGE); } } diff --git a/library/Zend/Validate/Abstract.php b/library/Zend/Validate/Abstract.php index c813b410a..48f3f5049 100644 --- a/library/Zend/Validate/Abstract.php +++ b/library/Zend/Validate/Abstract.php @@ -218,7 +218,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface if (null !== ($translator = $this->getTranslator())) { if ($translator->isTranslated($message)) { $message = $translator->translate($message); - } elseif ($translator->isTranslated($messageKey)) { + } else { $message = $translator->translate($messageKey); } } -- 2.11.4.GIT