Add new language selection

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

1 files changed, 12 insertions, 9 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
index 93f22730c..a63b3a7b1 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
@@ -2,6 +2,9 @@ package at.gv.egovernment.moa.id.configuration.validation.moaconfig;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS;
@@ -15,7 +18,7 @@ public class StorkConfigValidator {
 
 	private static final Logger log = Logger.getLogger(StorkConfigValidator.class);
 
-	public List<String> validate(GeneralStorkConfig form) {
+	public List<String> validate(GeneralStorkConfig form, HttpServletRequest request) {
 
 		List<String> errors = new ArrayList<String>();
 
@@ -31,17 +34,17 @@ public class StorkConfigValidator {
 					if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 						log.warn("CPEPS config countrycode contains potentail XSS characters: " + check);
 						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
-								new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+								new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 					}
 					if(!check.toLowerCase().matches("^[a-z][a-z]$")) {
 							log.warn("CPEPS config countrycode does not comply to ISO 3166-2 : " + check);
 							errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
-									new Object[] {check} ));
+									new Object[] {check}, request ));
 					}
 				} else {
 					log.warn("CPEPS config countrycode is empty : " + check);
 					errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.empty",
-							new Object[] {check} ));
+							new Object[] {check}, request ));
 				}
 	
 				// check url
@@ -49,12 +52,12 @@ public class StorkConfigValidator {
 				if (MiscUtil.isNotEmpty(check)) {
 					if (!ValidationHelper.validateURL(check)) {
 						log.info("CPEPS config URL is invalid : " + check);
-						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.url"));
+						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.url", request));
 					}
 				} else {
 					log.warn("CPEPS config url is empty : " + check);
 					errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.empty",
-							new Object[] {check} ));
+							new Object[] {check}, request ));
 				}
 			}
 		}
@@ -64,7 +67,7 @@ public class StorkConfigValidator {
 		if(1 > qaa && 4 < qaa) {
 			log.warn("QAA is out of range : " + qaa);
 			errors.add(LanguageHelper.getErrorString("validation.stork.qaa.outofrange",
-					new Object[] {qaa} ));
+					new Object[] {qaa}, request ));
 		}
 
 		// check attributes
@@ -73,12 +76,12 @@ public class StorkConfigValidator {
 				if (ValidationHelper.containsPotentialCSSCharacter(check.getName(), true)) {
 					log.warn("default attributes contains potentail XSS characters: " + check);
 					errors.add(LanguageHelper.getErrorString("validation.stork.requestedattributes",
-							new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} ));
+							new Object[] {ValidationHelper.getPotentialCSSCharacter(true)}, request ));
 				}
 				if(!check.getName().toLowerCase().matches("^[a-z0-9]*$")) {
 						log.warn("default attributes do not match the requested format : " + check);
 						errors.add(LanguageHelper.getErrorString("validation.stork.requestedattributes",
-								new Object[] {check} ));
+								new Object[] {check}, request ));
 				}
 			}