Merge pull request victorjonsson#332 from Igloczek/required-fields-messages

victorjonsson · victorjonsson · commit 8a6fb64b4911 · 2015-10-26T15:22:34.000+01:00
Required fields messages
diff --git a/form-validator/jquery.form-validator.js b/form-validator/jquery.form-validator.js
@@ -1027,7 +1027,12 @@
               if (!validationErrorMsg) {
                 validationErrorMsg = $elem.attr(conf.validationErrorMsgAttribute);
                 if (!validationErrorMsg) {
-                  validationErrorMsg = language[validator.errorMessageKey];
+                  if (typeof validator.errorMessageKey !== 'function') {
+                    validationErrorMsg = language[validator.errorMessageKey];
+                  }
+                  else {
+                    validationErrorMsg = language[validator.errorMessageKey(conf)];
+                  }
                   if (!validationErrorMsg) {
                     validationErrorMsg = validator.errorMessage;
                   }
@@ -1449,6 +1454,7 @@
      */
     LANG: {
       errorTitle: 'Form submission failed!',
+      requiredField: 'This is a required field',
       requiredFields: 'You have not answered all required fields',
       badTime: 'You have not given a correct time',
       badEmail: 'You have not given a correct e-mail address',
@@ -1565,7 +1571,14 @@
       }
     },
     errorMessage: '',
-    errorMessageKey: 'requiredFields'
+    errorMessageKey: function(config) {
+      if (config.errorMessagePosition === 'top' || config.errorMessagePosition === 'custom') {
+        return 'requiredFields';
+      }
+      else {
+        return 'requiredField';
+      }
+    }
   });
 
   /*
diff --git a/form-validator/lang/cz.dev.js b/form-validator/lang/cz.dev.js
@@ -16,6 +16,7 @@
 
     $.formUtils.LANG = {
       errorTitle: 'Podání formuláře selhalo!',
+      requiredField: 'Toto pole je povinné',
       requiredfields: 'Nebyly vyplněny všechny požadované pole',
       badTime: 'Neplatný čas',
       badEmail: 'Neplatná e-mailová adresa',
diff --git a/form-validator/lang/de.dev.js b/form-validator/lang/de.dev.js
@@ -16,6 +16,7 @@
 
     $.formUtils.LANG = {
       errorTitle: 'Ihre Anfrage konnte nicht gesendet werden!',
+      requiredField: 'Dies ist ein Pflichtfeld',
       requiredFields: 'Sie haben nicht alle Fragen beantwortet',
       badTime: 'Sie haben nicht die korrekte Zeit eingegeben',
       badEmail: 'Sie haben keine gültige E-Mail-Adresse eingegeben',
diff --git a/form-validator/lang/es.dev.js b/form-validator/lang/es.dev.js
@@ -16,6 +16,7 @@
 
     $.formUtils.LANG = {
       errorTitle: 'El formulario no se ha podido enviar!',
+      requiredField: 'Este campo es obligatorio',
       requiredFields: 'No ha contestado todos los campos requeridos',
       badTime: 'La hora proporcionada no es válida',
       badEmail: 'La dirección de e-mail no es válida',
diff --git a/form-validator/lang/fr.dev.js b/form-validator/lang/fr.dev.js
@@ -16,6 +16,7 @@
 
     $.formUtils.LANG = {
       errorTitle: 'Le formulaire n\'a pas pu être envoyé!',
+      requiredField: 'Ce champ est obligatoire',
       requiredFields: 'Vous n\'avez pas rempli tous les champs',
       badTime: 'Vous n\'avez pas saisi l\'heure correctement',
       badEmail: 'Vous n\'avez pas saisi une adresse e-mail valide',
diff --git a/form-validator/lang/pl.dev.js b/form-validator/lang/pl.dev.js
@@ -16,6 +16,7 @@
 
     $.formUtils.LANG = {
       errorTitle: 'Złożenie formularza nie powiodło się!',
+      requiredField: 'To pole jest wymagane',
       requiredfields: 'Nie wszystkie wymagane pola zostały wypełnione',
       badTime: 'Wprowadzono niepoprawny czas',
       badEmail: 'Wprowadzono niepoprawny adres e-mail',
diff --git a/form-validator/lang/pt.dev.js b/form-validator/lang/pt.dev.js
@@ -16,6 +16,7 @@
 
     $.formUtils.LANG = {
       errorTitle: 'O formulário não pode ser enviado!',
+      requiredField: 'Campo de preenchimento obrigatório',
       requiredFields: 'Você ainda não preencheu todos os campos obrigatórios',
       badTime: 'A hora digitada não é válida',
       badEmail: 'O e-mail digitado não é válido',
diff --git a/form-validator/lang/ro.dev.js b/form-validator/lang/ro.dev.js
@@ -16,6 +16,7 @@
 
     $.formUtils.LANG = {
       errorTitle: 'Nu sa reusit lansarea formularului!',
+      requiredField: 'Acest câmp este obligatoriu',
       requiredfields: 'Nu toate câmpurile obligatorii au fost completate',
       badTime: 'Timpul introdus este incorect',
       badEmail: 'Adresa de e-mail este incorectă',
diff --git a/form-validator/lang/ru.dev.js b/form-validator/lang/ru.dev.js
@@ -15,8 +15,9 @@
   $(window).bind('validatorsLoaded', function() {
 
     $.formUtils.LANG = {
-    
+
       errorTitle: 'Ошибка отправки формы!',
+      requiredField: 'Это обязательное поле',
       requiredFields: 'Вы задали не все обязательные поля',
       badTime: 'Вы задали некорректное время',
       badEmail: 'Вы задали некорректный e-mail',
diff --git a/form-validator/lang/sv.dev.js b/form-validator/lang/sv.dev.js
@@ -16,6 +16,7 @@
 
     $.formUtils.LANG = {
       errorTitle: 'Formuläret kunde inte skickas!',
+      requiredField: 'Detta är ett obligtoriskt fält',
       requiredFields: 'Du har inte besvarat alla frågor',
       badTime: 'Du har inte angett en korrekt tidpunkt',
       badEmail: 'Du har inte angett en korrekt e-postadress',
diff --git a/test/qunit.html b/test/qunit.html
@@ -175,18 +175,25 @@
          * Test error message
          */
         test('Error messages', function() {
-            var $input = input('', {'':'required'}),
+
+            // default inline (below input) error messages
+            var $input = input('', 'required'),
                 result = $.formUtils.validateInput($input, $.formUtils.LANG, $.formUtils.defaultConfig(), $form);
+            equal(result.errorMsg, 'This field is required', 'Incorrect message');
 
-            equal('You have not answered all required fields', result.errorMsg, 'Incorrect message');
+            // messages on top of form
+            var configWithTopMsg = $.formUtils.defaultConfig();
+            configWithTopMsg.errorMessagePosition = "top";
+            result = $.formUtils.validateInput($input, $.formUtils.LANG, configWithTopMsg, $form);
+            equal(result.errorMsg, 'You have not answered all required fields', 'Incorrect message');
 
             $input = input('--', {'':'required alphanumeric', 'error-msg-alphanumeric':'custom for alphanum'}),
             result = $.formUtils.validateInput($input, $.formUtils.LANG, $.formUtils.defaultConfig(), $form);
-            equal('custom for alphanum', result.errorMsg, 'Incorrect message');
+            equal(result.errorMsg, 'custom for alphanum', 'Incorrect message');
 
             $input = input('sam', {'':'required alphanumeric length', length:'min10', 'error-msg-alphanumeric':'custom for alphanum'}),
             result = $.formUtils.validateInput($input, $.formUtils.LANG, $.formUtils.defaultConfig(), $form);
-            equal('The input value is shorter than 10 characters', result.errorMsg, 'Incorrect message');
+            equal(result.errorMsg, 'The input value is shorter than 10 characters', 'Incorrect message');
 
         });
 
