Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.17 -r1.18
--- lams_admin/conf/language/ApplicationResources.properties	8 Aug 2006 05:04:09 -0000	1.17
+++ lams_admin/conf/language/ApplicationResources.properties	15 Aug 2006 00:38:31 -0000	1.18
@@ -70,8 +70,7 @@
 admin.organisation.name = Name
 admin.organisation.code = Code
 admin.organisation.description = Description
-admin.organisation.language = Language
-admin.organisation.country = Country
+admin.organisation.locale = Locale
 admin.organisation.status = Status
 admin.can.add.user = Group Administrators can add new users
 admin.can.browse.user = Group Administrators can browse all users in the system
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java,v
diff -u -r1.1 -r1.2
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java	7 Jun 2006 02:44:03 -0000	1.1
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java	15 Aug 2006 00:38:31 -0000	1.2
@@ -24,6 +24,8 @@
 
 import java.util.Date;
 
+import org.lamsfoundation.lams.usermanagement.SupportedLocale;
+
 /**
  * @version
  *
@@ -53,8 +55,7 @@
     private Date createDate;
     private boolean editable;
     private String status;
-	private String localeLanguage;
-	private String localeCountry;
+	private SupportedLocale locale;
 	
 	public String getCode() {
 		return code;
@@ -74,18 +75,13 @@
 	public void setDescription(String description) {
 		this.description = description;
 	}
-	public String getLocaleCountry() {
-		return localeCountry;
+	public SupportedLocale getLocale() {
+		return locale;
 	}
-	public void setLocaleCountry(String localeCountry) {
-		this.localeCountry = localeCountry;
+	public void setLocale(SupportedLocale locale) {
+		this.locale = locale;
 	}
-	public String getLocaleLanguage() {
-		return localeLanguage;
-	}
-	public void setLocaleLanguage(String localeLanguage) {
-		this.localeLanguage = localeLanguage;
-	}
+
 	public String getName() {
 		return name;
 	}
Index: lams_admin/web/orglist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/orglist.jsp,v
diff -u -r1.9 -r1.10
--- lams_admin/web/orglist.jsp	18 Jul 2006 00:56:26 -0000	1.9
+++ lams_admin/web/orglist.jsp	15 Aug 2006 00:38:30 -0000	1.10
@@ -32,8 +32,7 @@
 	<th><fmt:message key="admin.organisation.name"/></th>
 	<th><fmt:message key="admin.organisation.code"/></th>
 	<th><fmt:message key="admin.organisation.description"/></th>
-	<th><fmt:message key="admin.organisation.language"/></th>
-	<th><fmt:message key="admin.organisation.country"/></th>
+	<th><fmt:message key="admin.organisation.locale"/></th>
 	<th><fmt:message key="admin.organisation.status"/></th>
 </tr>
 <logic:iterate id="orgManageBean" name="OrgManageForm" property="orgManageBeans" indexId="idx">
@@ -51,14 +50,9 @@
 			<bean:write name="orgManageBean" property="description" />
 		</td>
 		<td>
-			<fmt:message key="locale.language.${orgManageBean.localeLanguage}"/>
+			<c:out value="${orgManageBean.locale.description}"/>
 		</td>
 		<td>
-			<c:if test="${!empty orgManageBean.localeCountry}">
-				<fmt:message key="locale.country.${orgManageBean.localeCountry}"/>
-			</c:if>
-		</td>
-		<td>
 			<fmt:message key="organisation.state.${orgManageBean.status}"/>
 		</td>
 	</tr>