Add new language selection

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

7 files changed, 95 insertions, 81 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index b77b47d15..5bb3f5143 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -163,9 +163,9 @@ public class EditGeneralConfigAction extends ActionSupport
 			
 			MOAConfigValidator validator = new MOAConfigValidator();
 			
-			List<String> errors = validator.validate(moaconfig);
+			List<String> errors = validator.validate(moaconfig, request);
 			
-			errors.addAll(new StorkConfigValidator().validate(storkconfig)); 
+			errors.addAll(new StorkConfigValidator().validate(storkconfig, request)); 
 
 			if (errors.size() > 0) {
 				log.info("General MOA-ID configuration has some errors.");
@@ -191,7 +191,7 @@ public class EditGeneralConfigAction extends ActionSupport
 		}
 
 		
-		addActionMessage(LanguageHelper.getGUIString("webpages.moaconfig.save.success"));
+		addActionMessage(LanguageHelper.getGUIString("webpages.moaconfig.save.success", request));
 		return Constants.STRUTS_SUCCESS;
 	}
 	
@@ -650,7 +650,7 @@ public class EditGeneralConfigAction extends ActionSupport
 			
 		} catch (MOADatabaseException e) {
 			log.warn("MOAID Configuration can not be stored in Database", e);
-			return LanguageHelper.getErrorString("error.db.oa.store");
+			return LanguageHelper.getErrorString("error.db.oa.store", request);
 		}
 
 		ConfigurationDBUtils.closeSession();
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 0ff60a656..2e8ec29de 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -125,7 +125,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 
             if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
                 log.info("Online-Applikation managemant disabled. Mail address is not verified.");
-                addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
+                addActionError(LanguageHelper.getErrorString("error.editoa.mailverification", request));
                 return Constants.STRUTS_SUCCESS;
             }
 
@@ -146,7 +146,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
         generalOA.parse(onlineapplication);
         ssoOA.parse(onlineapplication);
         saml1OA.parse(onlineapplication);
-        oauth20OA.parse(onlineapplication);
+        oauth20OA.parse(onlineapplication, request);
         session.setAttribute(Constants.SESSION_OAUTH20SECRET, this.oauth20OA.getClientSecret());
 
         storkOA.parse(onlineapplication);
@@ -157,7 +157,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 
         session.setAttribute(Constants.SESSION_BKUFORMPREVIEW, map);
 
-        List<String> errors = pvp2OA.parse(onlineapplication);
+        List<String> errors = pvp2OA.parse(onlineapplication, request);
 
         if (errors.size() > 0) {
             for (String el : errors)
@@ -200,7 +200,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 
         if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
             log.info("Online-Applikation managemant disabled. Mail address is not verified.");
-            addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
+            addActionError(LanguageHelper.getErrorString("error.editoa.mailverification", request));
             return Constants.STRUTS_SUCCESS;
         }
 
@@ -263,7 +263,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
         UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
         if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
             log.info("Online-Applikation managemant disabled. Mail address is not verified.");
-            addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
+            addActionError(LanguageHelper.getErrorString("error.editoa.mailverification", request));
             return Constants.STRUTS_SUCCESS;
         }
 
@@ -291,14 +291,14 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
         String oaidentifier = generalOA.getIdentifier();
         if (MiscUtil.isEmpty(oaidentifier)) {
             log.info("Empty OA identifier");
-            errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.empty"));
+            errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.empty", request));
 
         } else {
 
             if (!ValidationHelper.validateURL(oaidentifier)) {
                 log.warn("OnlineapplikationIdentifier is not a valid URL: " + oaidentifier);
                 errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.valid",
-                        new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()}));
+                        new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()}, request));
             } else {
 
                 if (oaid == -1) {
@@ -306,7 +306,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
                     newOA = true;
                     if (onlineapplication != null) {
                         log.info("The OAIdentifier is not unique");
-                        errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique"));
+                        errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request));
                     }
 
                 } else {
@@ -315,7 +315,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 
                         if (ConfigurationDBRead.getOnlineApplication(oaidentifier) != null) {
                             log.info("The OAIdentifier is not unique");
-                            errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique"));
+                            errors.add(LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request));
                         }
                     }
                 }
@@ -335,17 +335,17 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
         OAOAUTH20ConfigValidation validatior_oauth20 = new OAOAUTH20ConfigValidation();
         OAFileUploadValidation valiator_fileUpload = new OAFileUploadValidation();
 
-        errors.addAll(validatior_general.validate(generalOA, authUser.isAdmin()));
-        errors.addAll(validatior_pvp2.validate(pvp2OA));
-        errors.addAll(validatior_saml1.validate(saml1OA, generalOA));
-        errors.addAll(validatior_sso.validate(ssoOA, authUser.isAdmin()));
-        errors.addAll(validator_stork.validate(storkOA));
-        errors.addAll(validator_form.validate(formOA));
-        errors.addAll(validatior_oauth20.validate(oauth20OA));
+        errors.addAll(validatior_general.validate(generalOA, authUser.isAdmin(), request));
+        errors.addAll(validatior_pvp2.validate(pvp2OA, request));
+        errors.addAll(validatior_saml1.validate(saml1OA, generalOA, request));
+        errors.addAll(validatior_sso.validate(ssoOA, authUser.isAdmin(), request));
+        errors.addAll(validator_stork.validate(storkOA, request));
+        errors.addAll(validator_form.validate(formOA, request));
+        errors.addAll(validatior_oauth20.validate(oauth20OA, request));
 
         //validate BKU-selection template
         List<String> templateError = valiator_fileUpload.validate(generalOA.getBkuSelectionFileUploadFileName()
-                , generalOA.getBkuSelectionFileUpload(), "validation.general.bkuselection", bkuSelectionForm);
+                , generalOA.getBkuSelectionFileUpload(), "validation.general.bkuselection", bkuSelectionForm, request);
         if (templateError != null && templateError.size() == 0) {
             if (bkuSelectionForm != null && bkuSelectionForm.size() > 0)
                 session.setAttribute(Constants.SESSION_BKUSELECTIONTEMPLATE, bkuSelectionForm);
@@ -360,7 +360,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 
         //validate send-assertion template
         templateError = valiator_fileUpload.validate(generalOA.getSendAssertionFileUploadFileName()
-                , generalOA.getSendAssertionFileUpload(), "validation.general.sendassertion", sendAssertionForm);
+                , generalOA.getSendAssertionFileUpload(), "validation.general.sendassertion", sendAssertionForm, request);
         if (templateError != null && templateError.size() == 0) {
             if (sendAssertionForm != null && sendAssertionForm.size() > 0)
                 session.setAttribute(Constants.SESSION_SENDASSERTIONTEMPLATE, sendAssertionForm);
@@ -377,7 +377,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
         // Do not allow SSO in combination with special BKUSelection features
         if (ssoOA.isUseSSO() && (formOA.isOnlyMandateAllowed() || !formOA.isShowMandateLoginButton())) {
             log.warn("Special BKUSelection features can not be used in combination with SSO");
-            errors.add(LanguageHelper.getErrorString("validation.general.bkuselection.specialfeatures.valid"));
+            errors.add(LanguageHelper.getErrorString("validation.general.bkuselection.specialfeatures.valid", request));
         }
 
         if (errors.size() > 0) {
@@ -568,14 +568,14 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
         UserDatabase userdb = ConfigurationDBRead.getUserWithID(authUser.getUserID());
         if (!authUser.isAdmin() && userdb.isIsMailAddressVerified() != null && !userdb.isIsMailAddressVerified()) {
             log.info("Online-Applikation managemant disabled. Mail address is not verified.");
-            addActionError(LanguageHelper.getErrorString("error.editoa.mailverification"));
+            addActionError(LanguageHelper.getErrorString("error.editoa.mailverification", request));
             return Constants.STRUTS_SUCCESS;
         }
 
         String oaidentifier = generalOA.getIdentifier();
         if (MiscUtil.isEmpty(oaidentifier)) {
             log.info("Empty OA identifier");
-            addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.empty"));
+            addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.empty", request));
 
             formID = Random.nextRandom();
             session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -585,7 +585,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
             if (ValidationHelper.isValidOAIdentifier(oaidentifier)) {
                 log.warn("IdentificationNumber contains potentail XSS characters: " + oaidentifier);
                 addActionError(LanguageHelper.getErrorString("validation.general.oaidentifier.valid",
-                        new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()}));
+                        new Object[]{ValidationHelper.getNotValidOAIdentifierCharacters()}, request));
 
                 formID = Random.nextRandom();
                 session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -651,7 +651,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
         HttpSession session = request.getSession();
         if (session == null) {
             log.info("No http Session found.");
-            preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible");
+            preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible", request);
 
         } else {
             InputStream input = null;
@@ -708,13 +708,13 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
                     }
 
                 } else {
-                    preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible");
+                    preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible", request);
 
                 }
 
             } catch (Exception e) {
                 log.warn("BKUSelection Preview can not be generated.", e);
-                preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible");
+                preview = LanguageHelper.getErrorString("error.bkuformpreview.notpossible", request);
 
             }
         }
@@ -966,10 +966,10 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 
         } catch (CertificateException e) {
             log.info("Uploaded Certificate can not be found", e);
-            return LanguageHelper.getErrorString("validation.pvp2.certificate.notfound");
+            return LanguageHelper.getErrorString("validation.pvp2.certificate.notfound", request);
         } catch (IOException e) {
             log.info("Uploaded Certificate can not be parsed", e);
-            return LanguageHelper.getErrorString("validation.pvp2.certificate.format");
+            return LanguageHelper.getErrorString("validation.pvp2.certificate.format", request);
         }
 
         OASAML1 saml1 = authoa.getOASAML1();
@@ -1063,7 +1063,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
 
         } catch (MOADatabaseException e) {
             log.warn("Online-Application can not be stored.", e);
-            return LanguageHelper.getErrorString("error.db.oa.store");
+            return LanguageHelper.getErrorString("error.db.oa.store", request);
         }
 
         return null;
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java
index 655ce7a59..fb2a931fd 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java
@@ -93,7 +93,7 @@ implements ServletRequestAware, ServletResponseAware {
 			
 		} else {
 			log.info("No access to Import/Export for User with ID" + authUser.getUserID());
-			addActionError(LanguageHelper.getErrorString("errors.notallowed"));
+			addActionError(LanguageHelper.getErrorString("errors.notallowed", request));
 			return Constants.STRUTS_NOTALLOWED;
 		}	
 	}
@@ -128,7 +128,7 @@ implements ServletRequestAware, ServletResponseAware {
 			//load legacy config if it is configured
 		
 			if (fileUpload == null) {
-				addActionError(LanguageHelper.getErrorString("errors.importexport.nofile"));
+				addActionError(LanguageHelper.getErrorString("errors.importexport.nofile", request));
 				
 				formID = Random.nextRandom();
 				session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -149,7 +149,7 @@ implements ServletRequestAware, ServletResponseAware {
 				
 				} catch (ConfigurationException e) {
 					log.info("Legacy configuration has an Import Error", e);
-					addActionError(LanguageHelper.getErrorString("errors.importexport.legacyimport", new Object[] {e.getMessage()}));
+					addActionError(LanguageHelper.getErrorString("errors.importexport.legacyimport", new Object[] {e.getMessage()}, request));
 					ConfigurationDBUtils.closeSession();
 					
 					formID = Random.nextRandom();
@@ -203,12 +203,12 @@ implements ServletRequestAware, ServletResponseAware {
 			session.setAttribute(Constants.SESSION_FORMID, formID);
 			
 			log.info("Legacy Configuration load is completed.");
-			addActionMessage(LanguageHelper.getGUIString("webpages.inportexport.success"));
+			addActionMessage(LanguageHelper.getGUIString("webpages.inportexport.success", request));
 			return Constants.STRUTS_SUCCESS;
 			
 		} else {
 			log.info("No access to Import/Export for User with ID" + authUser.getUserID());
-			addActionError(LanguageHelper.getErrorString("errors.notallowed"));
+			addActionError(LanguageHelper.getErrorString("errors.notallowed", request));
 			return Constants.STRUTS_NOTALLOWED;
 		}
 	}
@@ -253,7 +253,7 @@ implements ServletRequestAware, ServletResponseAware {
 				
 				if (moaidconfig == null) {
 					log.info("No MOA-ID 2.x configruation available");
-					addActionError(LanguageHelper.getErrorString("errors.importexport.export.noconfig"));
+					addActionError(LanguageHelper.getErrorString("errors.importexport.export.noconfig", request));
 					
 					formID = Random.nextRandom();
 					session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -270,7 +270,7 @@ implements ServletRequestAware, ServletResponseAware {
 			} catch (JAXBException e) {
 				log.info("MOA-ID 2.x configruation could not be exported into a XML file.", e);
 				addActionError(LanguageHelper.getErrorString("errors.importexport.export",
-						new Object[]{e.getMessage()}));
+						new Object[]{e.getMessage()}, request));
 				
 				formID = Random.nextRandom();
 				session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -278,7 +278,7 @@ implements ServletRequestAware, ServletResponseAware {
 			} catch (IOException e) {
 				log.info("MOA-ID 2.x configruation could not be exported into a XML file.", e);
 				addActionError(LanguageHelper.getErrorString("errors.importexport.export",
-						new Object[]{e.getMessage()}));
+						new Object[]{e.getMessage()}, request));
 				
 				formID = Random.nextRandom();
 				session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -297,7 +297,7 @@ implements ServletRequestAware, ServletResponseAware {
 			return Constants.STRUTS_SUCCESS;
 		} else {
 			log.info("No access to Import/Export for User with ID" + authUser.getUserID());
-			addActionError(LanguageHelper.getErrorString("errors.notallowed"));
+			addActionError(LanguageHelper.getErrorString("errors.notallowed", request));
 			return Constants.STRUTS_NOTALLOWED;
 		}
 	}
@@ -332,7 +332,7 @@ implements ServletRequestAware, ServletResponseAware {
 		if (authUser.isAdmin()) {
 			
 			if (fileUpload == null) {
-				addActionError(LanguageHelper.getErrorString("errors.importexport.nofile"));
+				addActionError(LanguageHelper.getErrorString("errors.importexport.nofile", request));
 				
 				formID = Random.nextRandom();
 				session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -369,7 +369,7 @@ implements ServletRequestAware, ServletResponseAware {
 			} catch (Exception e) {
 				log.warn("MOA-ID XML configuration can not be loaded from File.", e);
 				addActionError(LanguageHelper.getErrorString("errors.importexport.import",
-						new Object[]{e.getMessage()}));
+						new Object[]{e.getMessage()}, request));
 				
 				formID = Random.nextRandom();
 				session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -386,12 +386,12 @@ implements ServletRequestAware, ServletResponseAware {
 			session.setAttribute(Constants.SESSION_FORMID, formID);
 			
 			log.info("XML Configuration load is completed.");
-			addActionMessage(LanguageHelper.getGUIString("webpages.inportexport.success"));
+			addActionMessage(LanguageHelper.getGUIString("webpages.inportexport.success", request));
 			return Constants.STRUTS_SUCCESS;
 		
 		} else {
 			log.info("No access to Import/Export for User with ID" + authUser.getUserID());
-			addActionError(LanguageHelper.getErrorString("errors.notallowed"));
+			addActionError(LanguageHelper.getErrorString("errors.notallowed", request));
 			return Constants.STRUTS_NOTALLOWED;
 		}
 	
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
index b96880b0a..78812769f 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
@@ -28,6 +28,7 @@ import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map.Entry;
 
 import javax.servlet.http.HttpServletRequest;
@@ -128,6 +129,10 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 			ConfigurationProvider config = ConfigurationProvider.getInstance();
 			pvp2LoginActiv = config.isPVP2LoginActive();
 			
+			if (request.getSession().getAttribute(Constants.SESSION_I18n) == null)
+				request.getSession().setAttribute(Constants.SESSION_I18n, 
+						Locale.forLanguageTag(config.getDefaultLanguage()));
+			
 			if (config.isLoginDeaktivated()) {
 				return "loginWithOutAuth";
 								
@@ -138,11 +143,16 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 			
 		} catch (ConfigurationException e) {
 			log.warn("An internal error occurs.", e);
-			addActionError(LanguageHelper.getErrorString("error.login.internal"));
+			addActionError(LanguageHelper.getErrorString("error.login.internal", request));
 			return Constants.STRUTS_ERROR;
 		}
 	}
 	
+	public String changeLanguage() {
+				
+		return Constants.STRUTS_SUCCESS;
+	}
+	
 	public String authenticate() {
 		
 		ConfigurationProvider config;
@@ -163,24 +173,24 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 			if (ValidationHelper.containsPotentialCSSCharacter(username, false)) {
 				log.warn("Username contains potentail XSS characters: " + username);
 				addActionError(LanguageHelper.getErrorString("validation.edituser.username.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 				return Constants.STRUTS_ERROR;
 			}
 		} else {
 			log.warn("Username is empty");
-			addActionError(LanguageHelper.getErrorString("validation.edituser.username.empty"));
+			addActionError(LanguageHelper.getErrorString("validation.edituser.username.empty", request));
 			return Constants.STRUTS_ERROR;
 		}
 		
 		if (MiscUtil.isEmpty(password)) {
 			log.warn("Password is empty");
-			addActionError(LanguageHelper.getErrorString("validation.edituser.password.empty"));
+			addActionError(LanguageHelper.getErrorString("validation.edituser.password.empty", request));
 			return Constants.STRUTS_ERROR;
 			
 		} else {
 			key = AuthenticationHelper.generateKeyFormPassword(password);
 			if (key == null) {
-				addActionError(LanguageHelper.getErrorString("validation.edituser.password.valid"));
+				addActionError(LanguageHelper.getErrorString("validation.edituser.password.valid", request));
 				return Constants.STRUTS_ERROR;
 			}
 		}
@@ -189,7 +199,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 		UserDatabase dbuser = ConfigurationDBRead.getUserWithUserName(username);
 		if (dbuser == null) {
 			log.warn("Unknown Username");
-			addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed"));
+			addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed", request));
 			return Constants.STRUTS_ERROR;
 			
 		} else {
@@ -199,13 +209,13 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 			
 			if (!dbuser.isIsActive() || !dbuser.isIsUsernamePasswordAllowed()) {
 				log.warn("Username " + dbuser.getUsername() + " is not active or Username/Password login is not allowed");
-				addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed"));
+				addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed", request));
 				return Constants.STRUTS_ERROR;
 			}
 						
 			if (!dbuser.getPassword().equals(key)) {
 				log.warn("Username " + dbuser.getUsername() + " use a false password");
-				addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed"));
+				addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed", request));
 				return Constants.STRUTS_ERROR;
 			}
 			
@@ -236,7 +246,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 				
 			} catch (MOADatabaseException e) {
 				log.warn("UserDatabase communicaton error", e);
-				addActionError(LanguageHelper.getErrorString("error.login"));
+				addActionError(LanguageHelper.getErrorString("error.login", request));
 				return Constants.STRUTS_ERROR;
 			}
 			finally {
@@ -306,7 +316,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 				Signature sign = samlResponse.getSignature();
 				if (sign == null) {
 					log.info("Only http POST Requests can be used");
-					addActionError(LanguageHelper.getErrorString("error.login"));
+					addActionError(LanguageHelper.getErrorString("error.login", request));
 					return Constants.STRUTS_ERROR;
 				}
 				
@@ -495,7 +505,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 								}
 								
 								log.info("User with bpk/wbpk " + bpkwbpk + " is not active");
-								addActionError(LanguageHelper.getErrorString("webpages.index.username.notactive"));
+								addActionError(LanguageHelper.getErrorString("webpages.index.username.notactive", request));
 								return Constants.STRUTS_ERROR;
 							}
 							
@@ -526,7 +536,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 								
 							} catch (MOADatabaseException e) {
 								log.warn("UserDatabase communicaton error", e);
-								addActionError(LanguageHelper.getErrorString("error.login"));
+								addActionError(LanguageHelper.getErrorString("error.login", request));
 								return Constants.STRUTS_ERROR;
 							}
 							finally {
@@ -541,24 +551,24 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 					}
 					
 					log.info("PVP2 Assertion was maybe not well formed, because no Assertion element could be found.");
-					addActionError(LanguageHelper.getErrorString("error.login.internal"));
+					addActionError(LanguageHelper.getErrorString("error.login.internal", request));
 					return Constants.STRUTS_ERROR;
 					
 				} else {
 					log.info("Receive Error Assertion.");
-					addActionError(LanguageHelper.getErrorString("error.login"));
+					addActionError(LanguageHelper.getErrorString("error.login", request));
 					return Constants.STRUTS_ERROR;
 				}
 				
 			} catch (Exception e) {
 				log.warn("An internal error occurs.", e);
-				addActionError(LanguageHelper.getErrorString("error.login.internal"));
+				addActionError(LanguageHelper.getErrorString("error.login.internal", request));
 				return Constants.STRUTS_ERROR;
 			}
 			
 		} else {
 			log.info("Only http POST Requests can be used");
-			addActionError(LanguageHelper.getErrorString("error.login.internal"));
+			addActionError(LanguageHelper.getErrorString("error.login.internal", request));
 			return Constants.STRUTS_ERROR;
 		}
 	}
@@ -621,11 +631,11 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 					if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
 						log.warn("Organisation contains potentail XSS characters: " + check);
 						addActionError(LanguageHelper.getErrorString("validation.edituser.institut.valid", 
-								new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+								new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 					}
 				} else {
 					log.warn("Organisation is empty");
-					addActionError(LanguageHelper.getErrorString("validation.edituser.institut.empty"));			
+					addActionError(LanguageHelper.getErrorString("validation.edituser.institut.empty", request));			
 				}
 			}
 			
@@ -634,11 +644,11 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 				if (!ValidationHelper.isEmailAddressFormat(check)) {
 					log.warn("Mailaddress is not valid: " + check);
 					addActionError(LanguageHelper.getErrorString("validation.edituser.mail.valid", 
-							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 				}
 			} else {
 				log.warn("Mailaddress is empty");
-				addActionError(LanguageHelper.getErrorString("validation.edituser.mail.empty"));			
+				addActionError(LanguageHelper.getErrorString("validation.edituser.mail.empty", request));			
 			}
 			
 			check = user.getPhone();
@@ -646,11 +656,11 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 				if (!ValidationHelper.validatePhoneNumber(check)) {
 					log.warn("No valid Phone Number: " + check);
 					addActionError(LanguageHelper.getErrorString("validation.edituser.phone.valid", 
-							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)} ));
+							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
 				}
 			} else {
 				log.warn("Phonenumber is empty");
-				addActionError(LanguageHelper.getErrorString("validation.edituser.phone.empty"));			
+				addActionError(LanguageHelper.getErrorString("validation.edituser.phone.empty", request));			
 			}
 			
 			if (hasActionErrors()) {
@@ -711,7 +721,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 				
 			} catch (ConfigurationException e) {
 				log.warn("Sending of mailaddress verification mail failed.", e);
-				addActionError(LanguageHelper.getErrorString("error.mail.send"));
+				addActionError(LanguageHelper.getErrorString("error.mail.send", request));
 				return Constants.STRUTS_NEWUSER;
 			}
 			
@@ -721,7 +731,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 				ConfigurationDBUtils.closeSession();
 			}
 			
-			addActionMessage(LanguageHelper.getGUIString("webpages.edituser.changemailaddress.verify"));
+			addActionMessage(LanguageHelper.getGUIString("webpages.edituser.changemailaddress.verify", request));
 			
 			session.invalidate();
 			
@@ -776,7 +786,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 					
 				} catch (MOADatabaseException e) {
 					log.warn("Userinformation can not be stored in Database.", e);
-					addActionError(LanguageHelper.getErrorString("error.mail.verification"));
+					addActionError(LanguageHelper.getErrorString("error.mail.verification", request));
 					
 				} catch (ConfigurationException e) {
 					log.warn("Send mail to admin failed.", e);
@@ -786,7 +796,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 					ConfigurationDBUtils.closeSession();
 				}
 				
-				addActionMessage(LanguageHelper.getGUIString("validation.newuser.mailaddress"));
+				addActionMessage(LanguageHelper.getGUIString("validation.newuser.mailaddress", request));
 				return Constants.STRUTS_SUCCESS;
 			}
 		}	
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
index 5e6c10f0c..4beb29343 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
@@ -93,7 +93,7 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware,
 		}
 					
 		if (dbOAs == null || dbOAs.size() == 0) {
-			addActionError(LanguageHelper.getErrorString("errors.listOAs.noOA"));
+			addActionError(LanguageHelper.getErrorString("errors.listOAs.noOA", request));
 			
 		} else {
 			formOAs = FormDataHelper.addFormOAs(dbOAs);
@@ -167,7 +167,7 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware,
 		
 		if (dbOAs == null || dbOAs.size() == 0) {
 			log.debug("No OAs found with Identifier " + friendlyname);
-			addActionError(LanguageHelper.getErrorString("errors.listOAs.noOA"));
+			addActionError(LanguageHelper.getErrorString("errors.listOAs.noOA", request));
 			
 		} else {
 			
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/MainAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/MainAction.java
index 007d22110..bc5f3049f 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/MainAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/MainAction.java
@@ -52,6 +52,10 @@ public class MainAction implements ServletRequestAware,
 //		configuration = ConfigurationProvider.getInstance();
 	}
 	
+	public String changeLanguage() {
+		
+		return Constants.STRUTS_SUCCESS;
+	}
 	
 	public String generateMainFrame() {
 		
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
index ac3fb9938..0c475b1d5 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
@@ -264,7 +264,7 @@ public class UserManagementAction extends ActionSupport
 		if (dbuser.isIsMandateUser() != null)
 			ismandate = dbuser.isIsMandateUser();
 		
-		errors = validator.validate(user, userID, ispvp2, ismandate);
+		errors = validator.validate(user, userID, ispvp2, ismandate, request);
 
 		if (errors.size() > 0) {
 			log.info("UserDataForm has some erros.");
@@ -302,11 +302,11 @@ public class UserManagementAction extends ActionSupport
 			
 			try {
 				MailHelper.sendUserMailAddressVerification(dbuser);
-				addActionMessage(LanguageHelper.getGUIString("webpages.edituser.changemailaddress.verify"));
+				addActionMessage(LanguageHelper.getGUIString("webpages.edituser.changemailaddress.verify", request));
 				
 			} catch (ConfigurationException e) {
 				log.warn("Sending of mailaddress verification mail failed.", e);
-				addActionError(LanguageHelper.getErrorString("error.mail.send"));
+				addActionError(LanguageHelper.getErrorString("error.mail.send", request));
 			}
 		}
 			
@@ -452,7 +452,7 @@ public class UserManagementAction extends ActionSupport
 			return Constants.STRUTS_ERROR;
 		}
 		
-		String 	message = LanguageHelper.getErrorString("error.mail.verification");
+		String 	message = LanguageHelper.getErrorString("error.mail.verification", request);
 		
 		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
 		authUser = (AuthenticatedUser) authUserObj;
@@ -469,11 +469,11 @@ public class UserManagementAction extends ActionSupport
 
 					MailHelper.sendUserMailAddressVerification(dbuser);
 					
-					message = LanguageHelper.getErrorString("webpages.edituser.verify.mail.message");
+					message = LanguageHelper.getErrorString("webpages.edituser.verify.mail.message", request);
 					
 				} catch (ConfigurationException e) {
 					log.warn("Sending of mailaddress verification mail failed.", e);
-					message = LanguageHelper.getErrorString("error.mail.send");
+					message = LanguageHelper.getErrorString("error.mail.send", request);
 					
 				} catch (MOADatabaseException e) {
 					log.warn("Access UserInformationDatabase failed.", e);
@@ -531,7 +531,7 @@ public class UserManagementAction extends ActionSupport
 			if (MiscUtil.isNotEmpty(user.getPassword())) {
 				String key = AuthenticationHelper.generateKeyFormPassword(user.getPassword());
 				if (key == null) {
-					return LanguageHelper.getErrorString("errors.edit.user.save");
+					return LanguageHelper.getErrorString("errors.edit.user.save", request);
 				}
 				dbuser.setPassword(key);			
 			}
@@ -541,7 +541,7 @@ public class UserManagementAction extends ActionSupport
 			ConfigurationDBUtils.saveOrUpdate(dbuser);
 		} catch (MOADatabaseException e) {
 			log.warn("User information can not be stored in Database.", e);
-			return LanguageHelper.getErrorString("errors.edit.user.save");
+			return LanguageHelper.getErrorString("errors.edit.user.save", request);
 		}
 		
 		return null;