Add new language selection

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

1 files changed, 8 insertions, 8 deletions

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;