Add new language selection

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

1 files changed, 16 insertions, 14 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java
index 758aa7dc7..ae7ee3c8e 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/FormularCustomizationValitator.java
@@ -25,6 +25,8 @@ package at.gv.egovernment.moa.id.configuration.validation;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.log4j.Logger;
 
 import at.gv.egovernment.moa.id.configuration.data.FormularCustomization;
@@ -35,14 +37,14 @@ public class FormularCustomizationValitator {
 	
 	private static final Logger log = Logger.getLogger(FormularCustomizationValitator.class);
 	
-	public List<String> validate(FormularCustomization form) {
+	public List<String> validate(FormularCustomization form, HttpServletRequest request) {
 		
 		List<String> errors = new ArrayList<String>();
 		String check;
 		
 		if (form.isOnlyMandateAllowed() && !form.isShowMandateLoginButton()) {
 			log.warn("OnlyMandateAllowed in combination with hidden MandateLoginCheckbox is not possible.");
-			errors.add(LanguageHelper.getErrorString("validation.general.bkuselection.specialfeatures.combination"));
+			errors.add(LanguageHelper.getErrorString("validation.general.bkuselection.specialfeatures.combination", request));
 		}
 		
 		check = form.getBackGroundColor();
@@ -52,7 +54,7 @@ public class FormularCustomizationValitator {
 			
 			if (!ValidationHelper.isValidHexValue(check)) {
 				log.warn("BKUSelectionBackGroundColor is not a valid hex value " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.form.color.background"));
+				errors.add(LanguageHelper.getErrorString("validation.general.form.color.background", request));
 			}
 		}
 		
@@ -63,7 +65,7 @@ public class FormularCustomizationValitator {
 			
 			if (!ValidationHelper.isValidHexValue(check)) {
 				log.warn("BKUSelectionFrontColor is not a valid hex value " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.form.color.front"));
+				errors.add(LanguageHelper.getErrorString("validation.general.form.color.front", request));
 			}
 		}
 		
@@ -74,7 +76,7 @@ public class FormularCustomizationValitator {
 			
 			if (!ValidationHelper.isValidHexValue(check)) {
 				log.warn("HeaderBackGroundColor is not a valid hex value " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.form.header.color.back"));
+				errors.add(LanguageHelper.getErrorString("validation.general.form.header.color.back", request));
 			}
 		}
 		
@@ -85,7 +87,7 @@ public class FormularCustomizationValitator {
 			
 			if (!ValidationHelper.isValidHexValue(check)) {
 				log.warn("HeaderFrontColor is not a valid hex value " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.form.header.color.front"));
+				errors.add(LanguageHelper.getErrorString("validation.general.form.header.color.front", request));
 			}
 		}
 		
@@ -94,7 +96,7 @@ public class FormularCustomizationValitator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 				log.warn("HeaderText contains potentail XSS characters: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.form.header.text", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 			}
 		}
 
@@ -105,7 +107,7 @@ public class FormularCustomizationValitator {
 			
 			if (!ValidationHelper.isValidHexValue(check)) {
 				log.warn("ButtonBackGroundColor is not a valid hex value " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.form.button.color.back"));
+				errors.add(LanguageHelper.getErrorString("validation.general.form.button.color.back", request));
 			}
 		}
 		
@@ -116,7 +118,7 @@ public class FormularCustomizationValitator {
 			
 			if (!ValidationHelper.isValidHexValue(check)) {
 				log.warn("ButtonBackGroundColorFocus is not a valid hex value " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.form.button.color.back.focus"));
+				errors.add(LanguageHelper.getErrorString("validation.general.form.button.color.back.focus", request));
 			}
 		}
 		
@@ -127,7 +129,7 @@ public class FormularCustomizationValitator {
 			
 			if (!ValidationHelper.isValidHexValue(check)) {
 				log.warn("ButtonFrontColor is not a valid hex value " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.form.button.color.front"));
+				errors.add(LanguageHelper.getErrorString("validation.general.form.button.color.front", request));
 			}
 		}
 		
@@ -135,7 +137,7 @@ public class FormularCustomizationValitator {
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!FormularCustomization.appletRedirectTargetList.contains(check)) {
 				log.warn("AppletRedirectTarget has not valid value " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.form.appletredirecttarget"));
+				errors.add(LanguageHelper.getErrorString("validation.general.form.appletredirecttarget", request));
 			}
 		}
 		
@@ -144,7 +146,7 @@ public class FormularCustomizationValitator {
 			if (ValidationHelper.containsPotentialCSSCharacter(check, true)) {
 				log.warn("FontType contains potentail XSS characters: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.form.fonttype", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)}, request ));
 			}
 		}
 		
@@ -153,7 +155,7 @@ public class FormularCustomizationValitator {
 			if (!ValidationHelper.validateNumber(check)) {
 				log.warn("Applet height "+ check + " is no valid number");
 				errors.add(LanguageHelper.getErrorString("validation.general.form.applet.height", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)}, request ));
 			}			
 		}
 		
@@ -162,7 +164,7 @@ public class FormularCustomizationValitator {
 			if (!ValidationHelper.validateNumber(check)) {
 				log.warn("Applet width "+ check + " is no valid number");
 				errors.add(LanguageHelper.getErrorString("validation.general.form.applet.width", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)}, request ));
 			}			
 		}