Merge branch 'hotfix/4183'

Close zendframework/zendframework#4183 Fixes zendframework/zendframework#2536
zendframework · Apr 12, 2013 · 4eb4184 · 4eb4184
commit 4eb4184
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/CreditCard.php b/src/CreditCard.php
@@ -51,7 +51,7 @@ class CreditCard extends AbstractValidator
         self::INVALID        => "Invalid type given. String expected",
         self::LENGTH         => "The input contains an invalid amount of digits",
         self::PREFIX         => "The input is not from an allowed institute",
-        self::SERVICE        => "The input seems to be an invalid credit card number.",
+        self::SERVICE        => "The input seems to be an invalid credit card number",
         self::SERVICEFAILURE => "An exception has been raised while validating the input",
     );
 

diff --git a/src/Explode.php b/src/Explode.php
@@ -20,7 +20,7 @@ class Explode extends AbstractValidator
      * @var array
      */
     protected $messageTemplates = array(
-        self::INVALID => "Invalid type given.",
+        self::INVALID => "Invalid type given",
     );
 
     /**

diff --git a/src/File/WordCount.php b/src/File/WordCount.php
@@ -28,8 +28,8 @@ class WordCount extends AbstractValidator
      * @var array Error message templates
      */
     protected $messageTemplates = array(
-        self::TOO_MUCH => "Too many words, maximum '%max%' are allowed but '%count%' were counted.",
-        self::TOO_LESS => "Too less words, minimum '%min%' are expected but '%count%' were counted",
+        self::TOO_MUCH => "Too many words, maximum '%max%' are allowed but '%count%' were counted",
+        self::TOO_LESS => "Too few words, minimum '%min%' are expected but '%count%' were counted",
         self::NOT_FOUND => "File is not readable or does not exist",
     );