Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -r13431d36984cc6e722c56e7d2dae2ce7301b93af -re1ca1dd14914eaa08c50ba33698e4bdbd9738840 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 13431d36984cc6e722c56e7d2dae2ce7301b93af) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision e1ca1dd14914eaa08c50ba33698e4bdbd9738840) @@ -31,6 +31,7 @@ import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; +import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO; @@ -272,4 +273,12 @@ * @return */ public Organisation saveOrganisation( Organisation organisation, Integer userID ); + + /** + * + * @param language + * @param country + * @return SupportedLocale + */ + public SupportedLocale getSupportedLocale(String language, String country); } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r323dcb9e7b2abf3cecee41494dd0bfe07733d378 -re1ca1dd14914eaa08c50ba33698e4bdbd9738840 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 323dcb9e7b2abf3cecee41494dd0bfe07733d378) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision e1ca1dd14914eaa08c50ba33698e4bdbd9738840) @@ -39,6 +39,7 @@ import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.Role; +import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; @@ -439,5 +440,13 @@ return organisation; } - + public SupportedLocale getSupportedLocale(String language, String country) { + Map properties = new HashMap(); + properties.put("languageIsoCode",language); + if(country!=null){ + properties.put("countryIsoCode",country); + } + List results = findByProperties(SupportedLocale.class,properties); + return results.isEmpty() ? null : (SupportedLocale)results.get(0); + } }