Add new language selection

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java

1 files changed, 9 insertions, 7 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
index 5286725df..f7adc1a67 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
@@ -26,6 +26,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
@@ -45,7 +47,7 @@ public class PVP2ContactValidator {
 		
 	private static final Logger log = Logger.getLogger(PVP2ContactValidator.class);
 	
-	public List<String >validate(ContactForm contact) {
+	public List<String >validate(ContactForm contact, HttpServletRequest request) {
 		List<String> errors = new ArrayList<String>();
 		
 		String check = contact.getCompany();
@@ -53,7 +55,7 @@ public class PVP2ContactValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.info("PVP2 Contact: Company is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.company.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 		
@@ -62,7 +64,7 @@ public class PVP2ContactValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.info("PVP2 Contact: GivenName is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.givenname.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 		
@@ -71,28 +73,28 @@ public class PVP2ContactValidator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.info("PVP2 Contact: SureName is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.surename.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 		
 		check = contact.getType();
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!AllowedTypes.contains(check)) {
-				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.type.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.type.valid", request));
 			}
 		}
 		
 		check = contact.getMail();
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!ValidationHelper.isEmailAddressFormat(check)) {
-				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.mail.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.mail.valid", request));
 			}
 		}
 		
 		check = contact.getPhone();
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!ValidationHelper.validatePhoneNumber(check)) {
-				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.phone.valid"));
+				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.phone.valid", request));
 			}
 		}