Merge pull request #585 from IOAyman/ioayman-ukrainian-local

Added ukranian locale
validatorjs · Sep 27, 2016 · 62b03db · 62b03db
2 parents bccf8a2 + e15b717
commit 62b03db
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 1 deletion.
diff --git a/lib/alpha.js b/lib/alpha.js
@@ -17,6 +17,7 @@ var alpha = exports.alpha = {
   'sr-RS@latin': /^[A-ZČĆŽŠĐ]+$/i,
   'sr-RS': /^[А-ЯЂЈЉЊЋЏ]+$/i,
   'tr-TR': /^[A-ZÇĞİıÖŞÜ]+$/i,
+  'uk-UA': /^[А-ЯЄIЇҐ]+$/i,
   ar: /^[ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/
 };
 
@@ -34,6 +35,7 @@ var alphanumeric = exports.alphanumeric = {
   'sr-RS@latin': /^[0-9A-ZČĆŽŠĐ]+$/i,
   'sr-RS': /^[0-9А-ЯЂЈЉЊЋЏ]+$/i,
   'tr-TR': /^[0-9A-ZÇĞİıÖŞÜ]+$/i,
+  'uk-UA': /^[0-9А-ЯЄIЇҐ]+$/i,
   ar: /^[٠١٢٣٤٥٦٧٨٩0-9ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/
 };
 

diff --git a/src/lib/alpha.js b/src/lib/alpha.js
@@ -12,6 +12,7 @@ export const alpha = {
   'sr-RS@latin': /^[A-ZČĆŽŠĐ]+$/i,
   'sr-RS': /^[А-ЯЂЈЉЊЋЏ]+$/i,
   'tr-TR': /^[A-ZÇĞİıÖŞÜ]+$/i,
+  'uk-UA': /^[А-ЯЄIЇҐ]+$/i,
   ar: /^[ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/,
 };
 
@@ -29,6 +30,7 @@ export const alphanumeric = {
   'sr-RS@latin': /^[0-9A-ZČĆŽŠĐ]+$/i,
   'sr-RS': /^[0-9А-ЯЂЈЉЊЋЏ]+$/i,
   'tr-TR': /^[0-9A-ZÇĞİıÖŞÜ]+$/i,
+  'uk-UA': /^[0-9А-ЯЄIЇҐ]+$/i,
   ar: /^[٠١٢٣٤٥٦٧٨٩0-9ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/,
 };
 

diff --git a/test/validators.js b/test/validators.js
@@ -776,6 +776,25 @@ describe('Validators', function () {
     });
   });
 
+  it('should validate ukranian alpha strings', function () {
+    test({
+      validator: 'isAlpha',
+      args: ['uk-UA'],
+      valid: [
+        'ЯЄIЇҐ',
+      ],
+      invalid: [
+        '0AİıÖöÇçŞşĞğÜüZ1',
+        '  AİıÖöÇçŞşĞğÜüZ  ',
+        'abc1',
+        '  foo  ',
+        '',
+        'ÄBC',
+        'Heiß',
+      ],
+    });
+  });
+
   it('should validate alphanumeric strings', function () {
     test({
       validator: 'isAlphanumeric',
@@ -956,6 +975,21 @@ describe('Validators', function () {
     });
   });
 
+  it('should validate urkrainian alphanumeric strings', function () {
+    test({
+      validator: 'isAlphanumeric',
+      args: ['uk-UA'],
+      valid: [
+        'ЯЄIЇҐ123',
+      ],
+      invalid: [
+        'éeoc ',
+        'foo!!',
+        'ÄBC',
+      ],
+    });
+  });
+
   it('should error on invalid locale', function () {
     try {
       validator.isAlphanumeric('abc123', 'in-INVALID');

diff --git a/validator.js b/validator.js
@@ -434,6 +434,7 @@
         'sr-RS@latin': /^[A-ZČĆŽŠĐ]+$/i,
         'sr-RS': /^[А-ЯЂЈЉЊЋЏ]+$/i,
         'tr-TR': /^[A-ZÇĞİıÖŞÜ]+$/i,
+        'uk-UA': /^[А-ЯЄIЇҐ]+$/i,
         ar: /^[ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/
       };
 
@@ -451,6 +452,7 @@
         'sr-RS@latin': /^[0-9A-ZČĆŽŠĐ]+$/i,
         'sr-RS': /^[0-9А-ЯЂЈЉЊЋЏ]+$/i,
         'tr-TR': /^[0-9A-ZÇĞİıÖŞÜ]+$/i,
+        'uk-UA': /^[0-9А-ЯЄIЇҐ]+$/i,
         ar: /^[٠١٢٣٤٥٦٧٨٩0-9ءآأؤإئابةتثجحخدذرزسشصضطظعغفقكلمنهوىيًٌٍَُِّْٰ]+$/
       };