pageContext.response.locale contains the Spring selected language

src/main/webapp/WEB-INF/jsp/accession/explore-es.jsp

@@ -261,7 +261,7 @@
 					<%-- <td><a href="<c:url value="/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><c:out value="${accession.taxonomy.sciName}" /></a></td> --%>
 					<td><c:out value="${accession.taxonomy.sciName}" /></td>
 					<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.orgCty.iso3}" />"><c:out value="${accession.orgCty.name}" /></a></td> --%>
-					<td class="notimportant"><c:out value="${jspHelper.getCountry(accession.orgCty.iso3).getName(pageContext.request.locale)}" /></td>
+					<td class="notimportant"><c:out value="${jspHelper.getCountry(accession.orgCty.iso3).getName(pageContext.response.locale)}" /></td>
 					<td class="notimportant"><spring:message code="accession.sampleStatus.${accession.sampStat}" /></td>
 					<td class="notimportant"><a href="<c:url value="/wiews/${accession.institute.code}" />"><c:out value="${accession.institute.code}" /></a></td>
 					<%-- 			<td><a href="<c:url value="/geo/${accession.institute.country.iso3}" />"><c:out value="${accession.institute.country.name}" /></a></td>

src/main/webapp/WEB-INF/jsp/accession/modal.jsp

@@ -14,7 +14,7 @@
     <c:forEach items="${categories}" var="category">
         <c:if test="${descriptors[category].size() gt 0}">
             <div class="row">
-            	<h2><c:out value="${crop.getName(pageContext.request.locale)}:" /> <c:out value="${category.getName(pageContext.request.locale)}" /></h2>
+            	<h2><c:out value="${crop.getName(pageContext.response.locale)}:" /> <c:out value="${category.getName(pageContext.response.locale)}" /></h2>
             </div>
             <c:forEach items="${descriptors[category]}" var="descriptor">
                 <c:if test="${methods[descriptor.id].size() gt 0}">

src/main/webapp/WEB-INF/jsp/accession/termresult.jspf

@@ -18,10 +18,10 @@
 	<tr><td>
 	<c:choose>
 		<c:when test="${type=='country'}">
-			<a href="<c:url value="/geo/${term.term.toUpperCase()}" />"><c:out value="${jspHelper.getCountry(term.term).getName(pageContext.request.locale)}" /></a>
+			<a href="<c:url value="/geo/${term.term.toUpperCase()}" />"><c:out value="${jspHelper.getCountry(term.term).getName(pageContext.response.locale)}" /></a>
 		</c:when>
 		<c:when test="${type=='crop'}">
-			<c:out value="${jspHelper.getCrop(term.term).getName(pageContext.request.locale)}" />
+			<c:out value="${jspHelper.getCrop(term.term).getName(pageContext.response.locale)}" />
 		</c:when>
 		<c:when test="${type=='instCode'}">
 			<a href="<c:url value="/wiews/${term.term.toUpperCase()}" />"><c:out value="${term.term.toUpperCase()}" /></a>

src/main/webapp/WEB-INF/jsp/filter/cropdescriptors.jsp

@@ -13,7 +13,7 @@
 <div id="allfilters">
 <c:forEach items="${categories}" var="category">
 <c:if test="${descriptors[category].size() gt 0}">
-	<h2><c:out value="${crop.getName(pageContext.request.locale)}:" /> <c:out value="${category.getName(pageContext.request.locale)}" /></h2>
+	<h2><c:out value="${crop.getName(pageContext.response.locale)}:" /> <c:out value="${category.getName(pageContext.response.locale)}" /></h2>
 	<c:forEach items="${descriptors[category]}" var="descriptor">
 	<c:if test="${methods[descriptor.id].size() gt 0}">
 		<div class="row filter-block">

src/main/webapp/WEB-INF/jsp/filter/traitfilter.jsp

@@ -13,7 +13,7 @@
 
 <c:forEach items="${categories}" var="category">
 <c:if test="${descriptors[category].size() gt 0}">
-	<h2><c:out value="${crop.getName(pageContext.request.locale)}:" /> <c:out value="${category.getName(pageContext.request.locale)}" /></h2>
+	<h2><c:out value="${crop.getName(pageContext.response.locale)}:" /> <c:out value="${category.getName(pageContext.response.locale)}" /></h2>
 	<c:forEach items="${descriptors[category]}" var="descriptor">
 	<c:if test="${methods[descriptor.id].size() gt 0}">
 		<div class="row filter-block">

src/main/webapp/WEB-INF/jsp/search/accessions.jsp

@@ -73,7 +73,7 @@
 						<%-- <td><a href="<c:url value="/acn/t/${accession.taxonomy.genus}/${accession.taxonomy.species}" />"><c:out value="${accession.taxonomy.sciName}" /></a></td> --%>
 						<td><c:out value="${accession.taxonomy.sciName}" /></td>
 						<%-- <td class="notimportant"><a href="<c:url value="/geo/${accession.orgCty.iso3}" />"><c:out value="${accession.orgCty.name}" /></a></td> --%>
-						<td class="notimportant"><c:out value="${jspHelper.getCountry(accession.orgCty.iso3).getName(pageContext.request.locale)}" /></td>
+						<td class="notimportant"><c:out value="${jspHelper.getCountry(accession.orgCty.iso3).getName(pageContext.response.locale)}" /></td>
 						<td class="notimportant"><spring:message code="accession.sampleStatus.${accession.sampStat}" /></td>
 						<td class="notimportant"><a href="<c:url value="/wiews/${accession.institute.code}" />"><c:out value="${accession.institute.code}" /></a></td>
 					</tr>