Merge pull request #439 from tormaroe/norwegian-phone-numbers

Norwegian phone numbers
validatorjs · Oct 8, 2015 · 427806e · 427806e
2 parents a5d3874 + bc6be2e
commit 427806e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 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']`).
+- **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']`).
 - **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
@@ -1519,6 +1519,38 @@ describe('Validators', function () {
         ],
         args: ['ru-RU']
       });
+
+      var norwegian = {
+        valid: [
+          '+4796338855'
+          , '+4746338855'
+          , '4796338855'
+          , '4746338855'
+          , '46338855'
+          , '96338855'
+        ]
+        , invalid: [
+          '12345'
+          , ''
+          , 'Vml2YW11cyBmZXJtZtesting123'
+          , '+4676338855'
+          , '19676338855'
+          , '+4726338855'
+          , '4736338855'
+          , '66338855'
+      ]};
+      test({
+        validator: 'isMobilePhone'
+        , valid: norwegian.valid
+        , invalid: norwegian.invalid,
+        args: ['nb-NO']
+      });
+      test({
+        validator: 'isMobilePhone'
+        , valid: norwegian.valid
+        , invalid: norwegian.invalid,
+        args: ['nn-NO']
+      });
     });
 
     it('should validate currency', function() {

diff --git a/validator.js b/validator.js
@@ -90,7 +90,9 @@
       'en-GB': /^(\+?44|0)7\d{9}$/,
       'en-US': /^(\+?1)?[2-9]\d{2}[2-9](?!11)\d{6}$/,
       'en-ZM': /^(\+26)?09[567]\d{7}$/,
-      'ru-RU': /^(\+?7|8)?9\d{9}$/
+      'ru-RU': /^(\+?7|8)?9\d{9}$/,
+      'nb-NO': /^(\+?47)?[49]\d{7}$/,
+      'nn-NO': /^(\+?47)?[49]\d{7}$/
     };
 
     // from http://goo.gl/0ejHHW