Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== diff -u -r8c9234ae2837bef1869b6135831d450ddd9d4963 -r7c089ab5db669951c510d23b299777d7ba03edec --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision 8c9234ae2837bef1869b6135831d450ddd9d4963) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision 7c089ab5db669951c510d23b299777d7ba03edec) @@ -51,6 +51,8 @@ import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.util.HttpSessionManager; @@ -143,6 +145,17 @@ }else{ String[] roles = new String[0]; userForm.set("roles",roles); + try{ + String defaultLocale = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); + log.debug("defaultLocale: "+defaultLocale); + Map properties = new HashMap(); + properties.put("languageIsoCode",defaultLocale.substring(0,2)); + properties.put("countryIsoCode",defaultLocale.substring(3)); + SupportedLocale locale = (SupportedLocale)service.findByProperties(SupportedLocale.class,properties).get(0); + userForm.set("localeId",locale.getLocaleId()); + }catch(Exception e){ + log.debug(e); + } } Organisation org = (Organisation)service.findById(Organisation.class,orgId);