Merge branch 'hotfix/7432'

Close zendframework/zendframework#7432
zendframework · May 6, 2015 · 5c04254 · 5c04254
3 parents 565dda8 + 5415db9 + ac815da
commit 5c04254
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/languages/en/Zend_Validate.php b/languages/en/Zend_Validate.php
@@ -8,7 +8,7 @@
  */
 
 /**
- * EN-Revision: 16.Jul.2013
+ * EN-Revision: 08.Apr.2015
  */
 return array(
     // Zend\I18n\Validator\Alnum
@@ -25,11 +25,11 @@
     "Invalid type given. String expected" => "Invalid type given. String expected",
     "The input does not appear to be a valid datetime" => "The input does not appear to be a valid datetime",
 
-    // Zend\I18n\Validator\Float
+    // Zend\I18n\Validator\IsFloat
     "Invalid type given. String, integer or float expected" => "Invalid type given. String, integer or float expected",
     "The input does not appear to be a float" => "The input does not appear to be a float",
 
-    // Zend\I18n\Validator\Int
+    // Zend\I18n\Validator\IsInt
     "Invalid type given. String or integer expected" => "Invalid type given. String or integer expected",
     "The input does not appear to be an integer" => "The input does not appear to be an integer",
 
@@ -291,6 +291,11 @@
     "The input is less than %min% characters long" => "The input is less than %min% characters long",
     "The input is more than %max% characters long" => "The input is more than %max% characters long",
 
+    // Zend\Validator\Timezone
+    "Invalid timezone given." => "Invalid timezone given.",
+    "Invalid timezone location given." => "Invalid timezone location given.",
+    "Invalid timezone abbreviation given." => "Invalid timezone abbreviation given.",
+
     // Zend\Validator\Uri
     "Invalid type given. String expected" => "Invalid type given. String expected",
     "The input does not appear to be a valid Uri" => "The input does not appear to be a valid Uri",