Merge pull request #452 from grawlinson/master

Added 'en-NZ' option for isMobilePhone function.
validatorjs · Nov 20, 2015 · 3863033 · 3863033
2 parents 3dbb0cf + a43a80c
commit 3863033
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ $ bower install validator-js
 - **isJSON(str)** - check if the string is valid JSON (note: uses JSON.parse).
 - **isLength(str, min [, max])** - check if the string's length falls in a range. Note: this function takes into account surrogate pairs.
 - **isLowercase(str)** - check if the string is lowercase.
-- **isMobilePhone(str, locale)** - check if the string is a mobile phone number, (locale is one of `['zh-CN', 'zh-TW', 'en-ZA', 'en-AU', 'en-HK', 'pt-PT', 'fr-FR', 'el-GR', 'en-GB', 'en-US', 'en-ZM', 'ru-RU', 'nb-NO', 'nn-NO', 'vi-VN']`).
+- **isMobilePhone(str, locale)** - check if the string is a mobile phone number, (locale is one of `['zh-CN', 'zh-TW', 'en-ZA', 'en-AU', 'en-HK', 'pt-PT', 'fr-FR', 'el-GR', 'en-GB', 'en-US', 'en-ZM', 'ru-RU', 'nb-NO', 'nn-NO', 'vi-VN', 'en-NZ']`).
 - **isMongoId(str)** - check if the string is a valid hex-encoded representation of a [MongoDB ObjectId][mongoid].
 - **isMultibyte(str)** - check if the string contains one or more multibyte chars.
 - **isNull(str)** - check if the string is null.

diff --git a/test/validators.js b/test/validators.js
@@ -1531,6 +1531,28 @@ describe('Validators', function () {
         args: ['ru-RU']
       });
 
+      test({
+        validator: 'isMobilePhone'
+        , valid: [
+          '+6427987035'
+          , '642240512347'
+          , '0293981646'
+          , '029968425'
+        ]
+        , invalid: [
+          '12345'
+          , ''
+          , 'Vml2YW11cyBmZXJtZtesting123'
+          , '+642956696123566'
+          , '+02119620856'
+          , '+9676338855'
+          , '19676338855'
+          , '6676338855'
+          , '+99676338855'
+        ],
+        args: ['en-NZ']
+      });
+
       var norwegian = {
         valid: [
           '+4796338855'

diff --git a/validator.js b/validator.js
@@ -95,7 +95,8 @@
       'ru-RU': /^(\+?7|8)?9\d{9}$/,
       'nb-NO': /^(\+?47)?[49]\d{7}$/,
       'nn-NO': /^(\+?47)?[49]\d{7}$/,
-      'vi-VN': /^(0|\+?84)?((1(2([0-9])|6([2-9])|88|99))|(9((?!5)[0-9])))([0-9]{7})$/
+      'vi-VN': /^(0|\+?84)?((1(2([0-9])|6([2-9])|88|99))|(9((?!5)[0-9])))([0-9]{7})$/,
+      'en-NZ': /^(\+?64|0)2\d{7,9}$/
     };
 
     // from http://goo.gl/0ejHHW