#20 phrase with parameters was splitted

ESPD · Aug 25, 2016 · 5a42257 · 5a42257
1 parent 0ee7bc2
commit 5a42257
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp b/espd-web/src/main/resources/META-INF/resources/WEB-INF/views/filter.jsp
@@ -93,12 +93,15 @@ $(function() {
                     <i class="info-label fa fa-info-circle fa-lg fa-li"></i>
                     <div id="filter_text">${span18n['filter_alert']}</div>
                     <div id="filter_faq">
-                        <s:message var="click_here" code="click_here"/>
-                        <c:set var="hereLink" value="<a id='here_link' href='http://ec.europa.eu/growth/single-market/public-procurement/e-procurement/espd/index_en.htm'>${click_here}</a>"/>
-                        <c:set var="faqLinkHref" value="http://ec.europa.eu/DocsRoom/documents/16002/attachments/1/translations/${pageContext.response.locale}/renditions/native"/>
-                        <s:message var="faqLeaflet" code="faq_leaflet"/>
-                        <c:set var="faqLink" value="<a id='faq_link' href='${faqLinkHref}'>${faqLeaflet}</a>"/>
-                        <s:message code="faq_text" arguments="${hereLink},${faqLink}"/>
+                        ${span18n['faq_text_more_info']}   
+                        <a href='http://ec.europa.eu/growth/single-market/public-procurement/e-procurement/espd/index_en.htm'>
+							${span18n['click_here']}
+                        </a>
+                        <br>
+                        ${span18n['faq_text_answers']}
+                        <a href='http://ec.europa.eu/DocsRoom/documents/16002/attachments/1/translations/${pageContext.response.locale}/renditions/native'>
+							${span18n['faq_leaflet']}
+                        </a>    
                     </div>
                 </li>
 			</ul>

diff --git a/espd-web/src/main/resources/i18n/messages.properties b/espd-web/src/main/resources/i18n/messages.properties
@@ -57,7 +57,8 @@ validator_rangelength=Please enter a value between {0} and {1} characters long.
 validator_range=Please enter a value between {0} and {1}.
 validator_max=Please enter a value less than or equal to {0}.
 validator_min=Please enter a value greater than or equal to {0}.
-faq_text=For more information on ESPD, please {0}.<br>If you are interested in the answers to the most frequently asked questions about the ESPD, please have a look at the {1}.</br>
+faq_text_more_info=For more information on ESPD, please 
+faq_text_answers=If you are interested in the answers to the most frequently asked questions about the ESPD, please have a look at the 
 click_here=click here
 faq_leaflet=FAQ leaflet
 footer_last_update=Last Update: