Used much more h:outputText instead of directly the message in the template. This...

diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 0eae8720f1f5b3b72ff35d57a02077fe6d435ca0..e5e3836bc244724c010627e7df53ee2870f2f5fd 100644 (file)
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -7,7 +7,9 @@
 
        <div class="para">
                <fieldset id="personal_data">
-                       <legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}</legend>
+                       <legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />
+                       </legend>
 
                        <div class="table_row">
                                <div class="table_left_medium">

diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
index 2113b82d48268f349697a699b44904547583419d..994c10225f91e53e4109cafbaa49501df3786ace 100644 (file)
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -11,7 +11,9 @@
 
        <div class="para">
                <fieldset id="country_data">
-                       <legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}</legend>
+                       <legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
+                       </legend>
 
                        <div class="table_row">
                                <div class="table_left_medium">

diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index e6a87ddb1fdd212d0f9b0eb7dd3764ce8f3151f0..0b259e3460e3b89eb8a8a0a51f8591de13f953e6 100644 (file)
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -11,7 +11,9 @@
 
        <div class="para">
                <fieldset id="mobile_provider">
-                       <legend title="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND_TITLE}">#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}</legend>
+                       <legend title="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}" />
+                       </legend>
 
                        <div class="table_row">
                                <div class="table_left_medium">

diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index fa1bb31d70902d13df76dcbd5cf34cf9c49eb79a..511af3b08f105b28e8483d537088641b38754c22 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -10,7 +10,9 @@
        <ui:fragment rendered="#{not empty mode}">
                <div class="para">
                        <fieldset id="login_data">
-                               <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}</legend>
+                               <legend title="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND_TITLE}">
+                                       <h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
+                               </legend>
 
                                <div class="table_row">
                                        <div class="table_left_medium">
@@ -52,7 +54,9 @@
 
                                <div class="para notice">
                                        <ul>
-                                               <li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
+                                               <li>
+                                                       <h:outputText value="#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}" />
+                                               </li>
 
                                                <li>
                                                        <h:outputText value="#{msg.ADMIN_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />

diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index a76da6d8ec1321972dd4563762c01b1736bb91ac..49e2ec502577c9838ec305c7f316764951068426 100644 (file)
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -12,7 +12,9 @@
 
        <div class="para">
                <fieldset id="personal_data">
-                       <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">#{msg.PERSONAL_DATA_LEGEND}</legend>
+                       <legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.PERSONAL_DATA_LEGEND}" />
+                       </legend>
 
                        <div class="table_row">
                                <div class="table_left">
@@ -222,7 +224,9 @@
        <ui:fragment rendered="#{userController.isPublicUserProfileEnabled()}">
                <div class="para">
                        <fieldset id="user_profile">
-                               <legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">#{msg.USER_PROFILE_LEGEND}</legend>
+                               <legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">
+                                       <h:outputText value="#{msg.USER_PROFILE_LEGEND}" />
+                               </legend>
 
                                <div class="table_row">
                                        <div class="table_left">
@@ -239,9 +243,9 @@
                                <div class="table_row">
                                        <div class="para notice">
                                                <ul>
-                                                       <li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}</li>
-                                                       <li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}</li>
-                                                       <li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}</li>
+                                                       <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}" /></li>
+                                                       <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}" /></li>
+                                                       <li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}" /></li>
                                                </ul>
                                        </div>
                                </div>

diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index b060e38f4e943d3f182382b225f51d2bb4055f80..0fa71d69d7d6c1981d3c289c75a648edbdc987aa 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -7,7 +7,9 @@
 
        <div class="para">
                <fieldset id="terms_privacy">
-                       <legend title="#{msg.PRIVACY_TERMS_LEGEND_TITLE}">#{msg.PRIVACY_TERMS_LEGEND}</legend>
+                       <legend title="#{msg.PRIVACY_TERMS_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.PRIVACY_TERMS_LEGEND}" />
+                       </legend>
 
                        <div class="table_row">
                                <div class="table_left25">
@@ -17,9 +19,9 @@
                                </div>
 
                                <div class="table_right75">
-                                       #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
                                        <h:link outcome="privacy" target="_blank" value="#{msg.LINK_GUEST_PRIVACY_STATEMENTS}" />
-                                       #{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_2}" />
                                </div>
 
                                <div class="clear"></div>
@@ -35,9 +37,9 @@
                                </div>
 
                                <div class="table_right75">
-                                       #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
                                        <h:link outcome="terms" target="_blank" value="#{msg.LINK_GUEST_TERMS_CONDITIONS}" />
-                                       #{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}
+                                       <h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_2}" />
                                </div>
 
                                <div class="clear"></div>

diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
index e34ebe30d07f31694dd5a61fea4a2dfe8d84d82a..d007b21727d2b36e4aff7d81b691cebb5cee0f39 100644 (file)
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -13,7 +13,9 @@
                                </div>
 
                                <fieldset id="login_data">
-                                       <legend title="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}</legend>
+                                       <legend title="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND_TITLE}">
+                                               <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}" />
+                                       </legend>
 
                                        <div class="table_row">
                                                <div class="table_left">

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index b8106fdfea9f0238af00249f80061f92a9140747..465fc01f785cdbcb0a6f50fce396303af1ffc52d 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -14,7 +14,9 @@
 
                        <div class="para">
                                <fieldset id="login_data">
-                                       <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}</legend>
+                                       <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
+                                               <h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
+                                       </legend>
 
                                        <ui:fragment rendered="#{userController.isUserNameRequired()}">
                                                <div class="table_row">
@@ -60,7 +62,7 @@
                                                </div>
 
                                                <div class="para notice">
-                                                       #{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}
+                                                       <h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" />
                                                </div>
                                        </ui:fragment>
                                </fieldset>

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index df3087a7da0998dff0c929fe27b2f3553f2fc62b..d26fd581dcb9a1f1b79c28419c4f79ad02a5ae71 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -8,14 +8,16 @@
        <h:form id="register_single_form">
                <div class="table">
                        <div class="table_header">
-                               #{msg.GUEST_REGISTRATION_TITLE}
+                               <h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
                        </div>
 
                        <ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
                        <div class="para">
                                <fieldset id="login_data">
-                                       <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}</legend>
+                                       <legend title="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND_TITLE}">
+                                               <h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
+                                       </legend>
 
                                        <ui:fragment rendered="#{userController.isUserNameRequired()}">
                                                <div class="table_row">
@@ -61,7 +63,7 @@
                                                </div>
 
                                                <div class="para notice">
-                                                       #{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}
+                                                       <h:outputText value="#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}" />
                                                </div>
                                        </ui:fragment>
                                </fieldset>

diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index 9a732b38c2a1107ada64927e5259b2ad1ea6282c..14717dead51ce68ea3aee5350c8160198cee04f2 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -7,7 +7,10 @@
 
        <div class="para">
                <fieldset id="current_password">
-                       <legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}</legend>
+                       <legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">
+                               <h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
+                       </legend>
+
                        <div class="table_row">
                                <div class="table_left">
                                        <h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />

diff --git a/web/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml
index 3beb00ecf6ee5d553fc32cf505082847f792a654..382db6282a607f06a322353d3e1b6efae817145b 100644 (file)
--- a/web/customer/empty_basket.xhtml
+++ b/web/customer/empty_basket.xhtml
@@ -24,7 +24,9 @@
                                                </div>
 
                                                <fieldset id="email_address_notice">
-                                                       <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">#{msg.RESEND_CONFIRMATION_LINK_LEGEND}</legend>
+                                                       <legend title="#{msg.RESEND_CONFIRMATION_LINK_LEGEND_TITLE}">
+                                                               <h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
+                                                       </legend>
 
                                                        <div class="table_row">
                                                                <div class="table_left">

diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
index 1890b69d2a2cd286de3aedd183c7a50641dfef36..01faefeff2ab9b312cc0bbfd86920bbbb6d20b84 100644 (file)
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -21,11 +21,13 @@
                                        <h:form id="lost_password_form">
                                                <div class="table">
                                                        <div class="table_header">
-                                                               #{msg.GUEST_LOST_PASSWORD_TITLE}
+                                                               <h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
                                                        </div>
 
                                                        <fieldset id="login_data">
-                                                               <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">#{msg.GUEST_LOST_PASSWORD_LEGEND}</legend>
+                                                               <legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">
+                                                                       <h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
+                                                               </legend>
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
@@ -40,7 +42,7 @@
                                                                </div>
 
                                                                <div class="table_header">
-                                                                       #{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}
+                                                                       <h:outputText value="#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}" />
                                                                </div>
 
                                                                <div class="table_row">

diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index f6bf9b9769fbd27fa6b488bc57c31d621526129d..ce3741e0e1a37c68e13c05f7279c823441fd04dc 100644 (file)
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -19,21 +19,23 @@
                        <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
-                                               #{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}
+                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
                                        </div>
 
                                        <h:form id="login_change_email_address_form">
                                                <div class="para">
                                                        <fieldset id="change_email">
-                                                               <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_EMAIL_LEGEND}</legend>
+                                                               <legend title="#{msg.LOGIN_CHANGE_EMAIL_LEGEND_TITLE}">
+                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
+                                                               </legend>
 
                                                                <div class="table_row">
                                                                        <div class="table_left">
-                                                                               #{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}
+                                                                               <h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
                                                                        </div>
 
                                                                        <div class="table_right">
-                                                                               #{contactController.emailAddress}
+                                                                               <h:outputText value="#{contactController.emailAddress}" />
                                                                        </div>
 
                                                                        <div class="clear"></div>

diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index aef02c12cff9ce4342062f581287b3061e85c1b5..b724c628ef3a5643114a94d929de0f5b4f42219f 100644 (file)
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -19,13 +19,15 @@
                        <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
                                <div class="table">
                                        <div class="table_header">
-                                               #{msg.LOGIN_CHANGE_PASSWORD_TITLE}
+                                               <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
                                        </div>
 
                                        <h:form id="login_form">
                                                <div class="para">
                                                        <fieldset id="change_password">
-                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}</legend>
+                                                               <legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
+                                                                       <h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
+                                                               </legend>
 
                                                                <div class="table_row">
                                                                        <div class="table_left">