royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject [royale-asjs] branch feature/validation updated: Fixed zip code validator
Date Sun, 01 Oct 2017 00:45:27 GMT
This is an automated email from the ASF dual-hosted git repository.

harbs pushed a commit to branch feature/validation
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/feature/validation by this push:
     new 54c1066  Fixed zip code validator
54c1066 is described below

commit 54c10662af397faae32151b6f5d1469e1830ffc4
Author: Harbs <harbs@in-tools.com>
AuthorDate: Sun Oct 1 03:45:23 2017 +0300

    Fixed zip code validator
---
 .../flex/utils/validation/ZipCodeValidator.as      | 31 ++++++----------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/validation/ZipCodeValidator.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/validation/ZipCodeValidator.as
index f074304..64f9ac9 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/validation/ZipCodeValidator.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/validation/ZipCodeValidator.as
@@ -19,7 +19,7 @@
 
 package org.apache.flex.utils.validation
 {
-
+    //TODO Make PAYG
 
     // [ResourceBundle("validators")]
 
@@ -459,10 +459,7 @@ package org.apache.flex.utils.validation
             allowedFormatCharsOverride = value;
 
             _allowedFormatChars = value != null ?
-                                value :
-                                resourceManager.getString(
-                                    "validators",
-                                    "zipCodeValidatorAllowedFormatChars");
+                                value : " -";
         }
 
         //----------------------------------
@@ -512,9 +509,7 @@ package org.apache.flex.utils.validation
             domainOverride = value;
 
             _domain = value != null ?
-                    value :
-                    resourceManager.getString(
-                        "validators", "zipCodeValidatorDomain");
+                    value : ZipCodeValidatorDomainType.US_ONLY;
         }
 
         //--------------------------------------------------------------------------
@@ -563,9 +558,7 @@ package org.apache.flex.utils.validation
             invalidCharErrorOverride = value;
 
             _invalidCharError = value != null ?
-                                value :
-                                resourceManager.getString(
-                                    "validators", "invalidCharErrorZCV");
+                                value : "The ZIP code contains invalid characters.";
         }
 
         //----------------------------------
@@ -608,9 +601,7 @@ package org.apache.flex.utils.validation
             invalidDomainErrorOverride = value;
 
             _invalidDomainError = value != null ?
-                                value :
-                                resourceManager.getString(
-                                    "validators", "invalidDomainErrorZCV");
+                                value : "The domain parameter is invalid. It must be either
'US Only' or 'US or Canada'.";
         }
         
         //----------------------------------
@@ -653,9 +644,7 @@ package org.apache.flex.utils.validation
             wrongCAFormatErrorOverride = value;
 
             _wrongCAFormatError = value != null ?
-                                value :
-                                resourceManager.getString(
-                                    "validators", "wrongCAFormatError");
+                                value : "The Canadian postal code must be formatted 'A1B
2C3'.";
         }
         
         //----------------------------------
@@ -698,9 +687,7 @@ package org.apache.flex.utils.validation
             wrongLengthErrorOverride = value;
 
             _wrongLengthError = value != null ?
-                                value :
-                                resourceManager.getString(
-                                    "validators", "wrongLengthErrorZCV");
+                                value : "The ZIP code must be 5 digits or 5+4 digits.";
         }
         
         //----------------------------------
@@ -743,9 +730,7 @@ package org.apache.flex.utils.validation
             wrongUSFormatErrorOverride = value;
 
             _wrongUSFormatError = value != null ?
-                                value :
-                                resourceManager.getString(
-                                    "validators", "wrongUSFormatError");
+                                value : "The ZIP+4 code must be formatted '12345-6789'.";
         }
 
         //--------------------------------------------------------------------------

-- 
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <commits@royale.apache.org>'].

Mime
View raw message