Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A236A200D1C for ; Sun, 1 Oct 2017 02:45:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A0A5E1609EE; Sun, 1 Oct 2017 00:45:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E69021609D5 for ; Sun, 1 Oct 2017 02:45:29 +0200 (CEST) Received: (qmail 95273 invoked by uid 500); 1 Oct 2017 00:45:29 -0000 Mailing-List: contact commits-help@royale.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@royale.apache.org Delivered-To: mailing list commits@royale.apache.org Received: (qmail 95261 invoked by uid 99); 1 Oct 2017 00:45:29 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Oct 2017 00:45:29 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 9CAEC8184D; Sun, 1 Oct 2017 00:45:27 +0000 (UTC) Date: Sun, 01 Oct 2017 00:45:27 +0000 To: "commits@royale.apache.org" Subject: [royale-asjs] branch feature/validation updated: Fixed zip code validator MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150681872718.2996.1132641933754015223@gitbox.apache.org> From: harbs@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: royale-asjs X-Git-Refname: refs/heads/feature/validation X-Git-Reftype: branch X-Git-Oldrev: 88c3e0cfc13070da87e1c0b5187c0aed4ad014be X-Git-Newrev: 54c10662af397faae32151b6f5d1469e1830ffc4 X-Git-Rev: 54c10662af397faae32151b6f5d1469e1830ffc4 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Sun, 01 Oct 2017 00:45:30 -0000 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 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" '].