Commit 6840cb46 authored by Matija Obreza's avatar Matija Obreza
Browse files

pageContext.response.locale contains the Spring selected language

parent 6d810d65
...@@ -261,7 +261,7 @@ ...@@ -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><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><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"><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"><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 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> <%-- <td><a href="<c:url value="/geo/${accession.institute.country.iso3}" />"><c:out value="${accession.institute.country.name}" /></a></td>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<c:forEach items="${categories}" var="category"> <c:forEach items="${categories}" var="category">
<c:if test="${descriptors[category].size() gt 0}"> <c:if test="${descriptors[category].size() gt 0}">
<div class="row"> <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> </div>
<c:forEach items="${descriptors[category]}" var="descriptor"> <c:forEach items="${descriptors[category]}" var="descriptor">
<c:if test="${methods[descriptor.id].size() gt 0}"> <c:if test="${methods[descriptor.id].size() gt 0}">
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
<tr><td> <tr><td>
<c:choose> <c:choose>
<c:when test="${type=='country'}"> <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>
<c:when test="${type=='crop'}"> <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>
<c:when test="${type=='instCode'}"> <c:when test="${type=='instCode'}">
<a href="<c:url value="/wiews/${term.term.toUpperCase()}" />"><c:out value="${term.term.toUpperCase()}" /></a> <a href="<c:url value="/wiews/${term.term.toUpperCase()}" />"><c:out value="${term.term.toUpperCase()}" /></a>
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div id="allfilters"> <div id="allfilters">
<c:forEach items="${categories}" var="category"> <c:forEach items="${categories}" var="category">
<c:if test="${descriptors[category].size() gt 0}"> <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:forEach items="${descriptors[category]}" var="descriptor">
<c:if test="${methods[descriptor.id].size() gt 0}"> <c:if test="${methods[descriptor.id].size() gt 0}">
<div class="row filter-block"> <div class="row filter-block">
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<c:forEach items="${categories}" var="category"> <c:forEach items="${categories}" var="category">
<c:if test="${descriptors[category].size() gt 0}"> <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:forEach items="${descriptors[category]}" var="descriptor">
<c:if test="${methods[descriptor.id].size() gt 0}"> <c:if test="${methods[descriptor.id].size() gt 0}">
<div class="row filter-block"> <div class="row filter-block">
......
...@@ -73,7 +73,7 @@ ...@@ -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><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><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"><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"><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 class="notimportant"><a href="<c:url value="/wiews/${accession.institute.code}" />"><c:out value="${accession.institute.code}" /></a></td>
</tr> </tr>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment