Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v diff -u -r1.27 -r1.28 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 27 Jun 2006 07:46:14 -0000 1.27 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 6 Jul 2006 06:48:00 -0000 1.28 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.39 -r1.40 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 5 Jul 2006 02:28:04 -0000 1.39 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 6 Jul 2006 06:48:00 -0000 1.40 @@ -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); + } }