Index: lams_admin/web/organisation.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/organisation.jsp,v
diff -u -r1.9 -r1.10
--- lams_admin/web/organisation.jsp	1 Aug 2006 04:05:21 -0000	1.9
+++ lams_admin/web/organisation.jsp	8 Aug 2006 02:16:00 -0000	1.10
@@ -55,10 +55,7 @@
 			<html-el:select property="localeId">
 				<c:forEach items="${locales}" var="locale">
 					<html-el:option value="${locale.localeId}">
-						<fmt:message key="locale.language.${locale.languageIsoCode}"/>
-						<c:if test="${!empty locale.countryIsoCode}">
-							&nbsp;(<fmt:message key="locale.country.${locale.countryIsoCode}"/>)
-						</c:if>
+						<c:out value="${locale.description}" />
 					</html-el:option>
 				</c:forEach>	
 			</html-el:select>