Add new language selection

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

1 files changed, 36 insertions, 26 deletions

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;
 			}
 		}