Merge pull request #904 from vietduc01100001/master

(isMobilePhone) update new number format for vi-VN locale
validatorjs · Oct 11, 2018 · f065477 · f065477
2 parents fba33e6 + 6a6da1e
commit f065477
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/lib/isMobilePhone.js b/lib/isMobilePhone.js
@@ -78,7 +78,7 @@ var phones = {
   'th-TH': /^(\+66|66|0)\d{9}$/,
   'tr-TR': /^(\+?90|0)?5\d{9}$/,
   'uk-UA': /^(\+?38|8)?0\d{9}$/,
-  'vi-VN': /^(\+?84|0)?((1(2([0-9])|6([2-9])|88|99))|(9((?!5)[0-9])))([0-9]{7})$/,
+  'vi-VN': /^(\+?84|0)((3([2-9]))|(5([689]))|(7([0|6-9]))|(8([1-5]))|(9([0-9])))([0-9]{7})$/,
   'zh-CN': /^((\+|00)86)?1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/,
   'zh-TW': /^(\+?886\-?|0)?9\d{8}$/
 };

diff --git a/src/lib/isMobilePhone.js b/src/lib/isMobilePhone.js
@@ -66,7 +66,7 @@ const phones = {
   'th-TH': /^(\+66|66|0)\d{9}$/,
   'tr-TR': /^(\+?90|0)?5\d{9}$/,
   'uk-UA': /^(\+?38|8)?0\d{9}$/,
-  'vi-VN': /^(\+?84|0)?((1(2([0-9])|6([2-9])|88|99))|(9((?!5)[0-9])))([0-9]{7})$/,
+  'vi-VN': /^(\+?84|0)((3([2-9]))|(5([689]))|(7([0|6-9]))|(8([1-5]))|(9([0-9])))([0-9]{7})$/,
   'zh-CN': /^((\+|00)86)?1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/,
   'zh-TW': /^(\+?886\-?|0)?9\d{8}$/,
 };

diff --git a/test/validators.js b/test/validators.js
@@ -3966,21 +3966,21 @@ describe('Validators', () => {
       {
         locale: 'vi-VN',
         valid: [
-          '01636012403',
-          '+841636012403',
-          '1636012403',
-          '841636012403',
-          '+84999999999',
-          '84999999999',
-          '0999999999',
-          '999999999',
+          '0336012403',
+          '+84586012403',
+          '84981577798',
+          '0708001240',
+          '84813601243',
         ],
         invalid: [
           '12345',
           '',
           'Vml2YW11cyBmZXJtZtesting123',
           '010-38238383',
           '260976684590',
+          '01678912345',
+          '+841698765432',
+          '841626543219',
         ],
       },
       {

diff --git a/validator.js b/validator.js
@@ -1180,7 +1180,7 @@ var phones = {
   'th-TH': /^(\+66|66|0)\d{9}$/,
   'tr-TR': /^(\+?90|0)?5\d{9}$/,
   'uk-UA': /^(\+?38|8)?0\d{9}$/,
-  'vi-VN': /^(\+?84|0)?((1(2([0-9])|6([2-9])|88|99))|(9((?!5)[0-9])))([0-9]{7})$/,
+  'vi-VN': /^(\+?84|0)((3([2-9]))|(5([689]))|(7([0|6-9]))|(8([1-5]))|(9([0-9])))([0-9]{7})$/,
   'zh-CN': /^((\+|00)86)?1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/,
   'zh-TW': /^(\+?886\-?|0)?9\d{8}$/
 };

diff --git a/validator.min.js b/validator.min.js