Index: lams_admin/web/orglist.jsp
===================================================================
diff -u -r1c7d6bc19d1cfaa6650fd1b00e820f29b40a642c -r629ca8978efe2d0cf2feeaa3917551548b2904c7
--- lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 1c7d6bc19d1cfaa6650fd1b00e820f29b40a642c)
+++ lams_admin/web/orglist.jsp	(.../orglist.jsp)	(revision 629ca8978efe2d0cf2feeaa3917551548b2904c7)
@@ -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>