Add new language selection

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

1 files changed, 8 insertions, 6 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
index 554aa9ff0..7bdcb65cf 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
@@ -25,6 +25,8 @@ package at.gv.egovernment.moa.id.configuration.validation.oa;
 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.AttributeProviderPlugin;
@@ -37,7 +39,7 @@ public class OASTORKConfigValidation {
 
 	private static final Logger log = Logger.getLogger(OASTORKConfigValidation.class);
 
-	public List<String> validate(OASTORKConfig oageneral) {
+	public List<String> validate(OASTORKConfig oageneral, HttpServletRequest request) {
 
 		List<String> errors = new ArrayList<String>();
 
@@ -46,29 +48,29 @@ public class OASTORKConfigValidation {
 		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 ));
 		}
 		
 		if (oageneral.isVidpEnabled()) {		
 			for(AttributeProviderPlugin current : oageneral.getAttributeProviderPlugins()) {
 				if (MiscUtil.isEmpty(current.getUrl()) || !ValidationHelper.validateURL(current.getUrl())) {
 					log.info("AttributeProviderPlugin URL has no valid form.");
-					errors.add(LanguageHelper.getErrorString("validation.stork.ap.url.valid"));
+					errors.add(LanguageHelper.getErrorString("validation.stork.ap.url.valid", request));
 				}
 				if (MiscUtil.isEmpty(current.getName())) {
 					log.info("AttributeProviderPlugin Name is empty.");
-					errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.empty"));
+					errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.empty", request));
 					
 				} else {
 					if (!oageneral.getAvailableAttributeProviderPlugins().contains(current.getName())) {
 						log.info("AttributeProviderPlugin Name is not supported.");
-						errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.valid"));
+						errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.valid", request));
 					}				
 				}
 				
 				if (MiscUtil.isEmpty(current.getAttributes()) || !current.getAttributes().matches("[a-zA-Z]+(, ?[a-zA-Z]+)*")) {
 					log.info("AttributeProviderPlugin attributes are empty or do not match csv format.");
-					errors.add(LanguageHelper.getErrorString("validation.stork.ap.attributes.valid"));
+					errors.add(LanguageHelper.getErrorString("validation.stork.ap.attributes.valid", request));
 				}
 			}