Browse Source

[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
thomas 15 years ago
parent
commit
46a6e9666e
2 changed files with 3 additions and 3 deletions
  1. 2 2
      library/Zend/Filter/Input.php
  2. 1 1
      library/Zend/Validate/Abstract.php

+ 2 - 2
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);
             }
         }

+ 1 - 1
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);
             }
         }