Don't cherry-pick:

- text needs to be wrapped into h:outputText

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl b/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl
index f086074fb1e8854c93df326b94a562c67edc88a4..611bc729dd075bd496d869493b924decbc21092c 100644 (file)
--- a/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl
+++ b/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl
@@ -6,7 +6,7 @@
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
        <div class="para notice">
-               #{msg.ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE}
+               <h:outputText value="#{msg.ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE}" />
        </div>
 
        <ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />

diff --git a/web/admin/category/admin_category_delete.xhtml b/web/admin/category/admin_category_delete.xhtml
index aa778a5662f7dbc6e31ba74a02d97871581d5cb7..6e5222a0db4447fe0d688207ccefca5e7cdefdd7 100644 (file)
--- a/web/admin/category/admin_category_delete.xhtml
+++ b/web/admin/category/admin_category_delete.xhtml
@@ -9,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CATEGORY}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CATEGORY}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_CATEGORY}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_CATEGORY}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/category/admin_category_edit.xhtml b/web/admin/category/admin_category_edit.xhtml
index 9fb8d65dd014b1f5fb7bbde13996d043f9d5841f..121d2c0110be80cbfef6ce17a96ef718c01130a5 100644 (file)
--- a/web/admin/category/admin_category_edit.xhtml
+++ b/web/admin/category/admin_category_edit.xhtml
@@ -9,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CATEGORY}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CATEGORY}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_CATEGORY}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_CATEGORY}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/category/admin_category_list.xhtml b/web/admin/category/admin_category_list.xhtml
index 2075c2c96b9805a67e3517d1dd8ebbe819458403..a0564035aca95c0f8ef5093470801cb1c0484350 100644 (file)
--- a/web/admin/category/admin_category_list.xhtml
+++ b/web/admin/category/admin_category_list.xhtml
@@ -9,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_CATEGORIES}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_CATEGORIES}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_CATEGORIES}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_CATEGORIES}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/customer/admin_customer_delete.xhtml b/web/admin/customer/admin_customer_delete.xhtml
index 8dcdbfb181cf38f7859ccb2affdcf8dd52d06b08..82486e52bec39682ee0725518a45fb04aa20a380 100644 (file)
--- a/web/admin/customer/admin_customer_delete.xhtml
+++ b/web/admin/customer/admin_customer_delete.xhtml
@@ -14,10 +14,12 @@
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CUSTOMER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CUSTOMER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_CUSTOMER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_CUSTOMER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/customer/admin_customer_edit.xhtml b/web/admin/customer/admin_customer_edit.xhtml
index 3bd118ae6b2abb8be1174f4c65c17480092530e2..f5055eeae2992acc35389ed0209be2f5f8939eaf 100644 (file)
--- a/web/admin/customer/admin_customer_edit.xhtml
+++ b/web/admin/customer/admin_customer_edit.xhtml
@@ -14,10 +14,12 @@
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CUSTOMER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CUSTOMER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_CUSTOMER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_CUSTOMER}" />
                </ui:define>
 
                <ui:define name="content">
@@ -26,11 +28,11 @@
                        <h:form id="admin_edit_customer" rendered="#{not empty adminHelper.customer}">
                                <div class="table">
                                        <div class="table_header">
-                                               #{msg.ADMIN_EDIT_CUSTOMER_TITLE}
+                                               <h:outputText value="#{msg.ADMIN_EDIT_CUSTOMER_TITLE}" />
                                        </div>
 
                                        <div class="para notice">
-                                               #{msg.ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE}
+                                               <h:outputText value="#{msg.ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE}" />
                                        </div>
 
                                        <ui:include src="/WEB-INF/templates/admin/customer/admin_form_customer_data.tpl">

diff --git a/web/admin/customer/admin_customer_list.xhtml b/web/admin/customer/admin_customer_list.xhtml
index 6f49bfc30ef087ebb40ad5f0a6ec599c52f2859b..66588a341af96b4d1b7c1615ea8c550ffe962205 100644 (file)
--- a/web/admin/customer/admin_customer_list.xhtml
+++ b/web/admin/customer/admin_customer_list.xhtml
@@ -9,16 +9,20 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CUSTOMER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CUSTOMER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_LIST_CUSTOMER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CUSTOMER}" />
                </ui:define>
 
                <ui:define name="content">
                        <h:dataTable id="table_list_customers" var="customer" value="#{customerController.allCustomers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CUSTOMER}" rendered="#{customerController.hasCustomers()}">
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CUSTOMER_ID}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CUSTOMER_ID}" />
+                                       </f:facet>
 
                                        <h:link outcome="admin_show_customer" title="#{msg.ADMIN_LINK_SHOW_CUSTOMER_TITLE}" value="#{customer.customerId}">
                                                <f:param name="customerId" value="#{customer.customerId}" />
@@ -26,37 +30,49 @@
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CUSTOMER_NUMBER}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CUSTOMER_NUMBER}" />
+                                       </f:facet>
 
                                        <h:outputText value="#{customer.customerNumber}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CONTACT_GENDER}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_GENDER}" />
+                                       </f:facet>
 
                                        <h:outputText value="#{msg[customer.customerContact.contactGender.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CONTACT_FIRST_NAME}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+                                       </f:facet>
 
                                        <h:outputText value="#{customer.customerContact.contactFirstName}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CONTACT_FAMILY_NAME}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+                                       </f:facet>
 
                                        <h:outputText value="#{customer.customerContact.contactFamilyName}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CUSTOMER_ACCOUNT_STATUS}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CUSTOMER_ACCOUNT_STATUS}" />
+                                       </f:facet>
 
                                        <h:outputText styleClass="#{customer.customerAccountStatus.styleClass}" value="#{msg[customer.customerAccountStatus.messageKey]}" />
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.ADMIN_CUSTOMER_CREATED}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.ADMIN_CUSTOMER_CREATED}" />
+                                       </f:facet>
 
                                        <h:outputText id="customerCreated" value="#{customer.customerCreated.time}">
                                                <f:convertDateTime for="customerCreated" type="both" timeStyle="short" dateStyle="short" />
@@ -67,12 +83,14 @@
                        <div class="table_medium">
                                <h:form id="admin_add_customer">
                                        <div class="table_header">
-                                               #{msg.ADMIN_ADD_CUSTOMER_TITLE}
+                                               <h:outputText value="#{msg.ADMIN_ADD_CUSTOMER_TITLE}" />
                                        </div>
 
                                        <div class="para">
                                                <fieldset id="customer_contact">
-                                                       <legend title="#{msg.ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND_TITLE}">#{msg.ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND}</legend>
+                                                       <legend title="#{msg.ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND_TITLE}">
+                                                               <h:outputText value="#{msg.ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND}" />
+                                                       </legend>
 
                                                        <div class="table_row">
                                                                <div class="table_left_medium">

diff --git a/web/admin/customer/admin_customer_show.xhtml b/web/admin/customer/admin_customer_show.xhtml
index 8724d2efe191245b91daed59f2553753d192f303..6ac86c02412578940fb31beb5c42e734fab04d7d 100644 (file)
--- a/web/admin/customer/admin_customer_show.xhtml
+++ b/web/admin/customer/admin_customer_show.xhtml
@@ -14,10 +14,12 @@
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CUSTOMER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CUSTOMER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_SHOW_CUSTOMER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_CUSTOMER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/customer/admin_customer_unlock.xhtml b/web/admin/customer/admin_customer_unlock.xhtml
index f39ae0e6b5bc66b25d160fdf9e402a5e353c43e1..167384cec32ba70951cc34c4b7dd48e2df1a0779 100644 (file)
--- a/web/admin/customer/admin_customer_unlock.xhtml
+++ b/web/admin/customer/admin_customer_unlock.xhtml
@@ -9,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_CUSTOMER}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_CUSTOMER}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_UNLOCK_CUSTOMER}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLOCK_CUSTOMER}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/product/admin_product_delete.xhtml b/web/admin/product/admin_product_delete.xhtml
index a76437b60e47cb22012d905538968e976f530ae6..66be5e161da2be88c29cb2e87859d963d531eeac 100644 (file)
--- a/web/admin/product/admin_product_delete.xhtml
+++ b/web/admin/product/admin_product_delete.xhtml
@@ -9,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_PRODUCT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_PRODUCT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_DELETE_PRODUCT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_PRODUCT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/product/admin_product_edit.xhtml b/web/admin/product/admin_product_edit.xhtml
index 8170d36915569b12e69f32c2e2dfb7655df91a2d..3687dcce9b5d8d24a82def5ccfb9024b8c1ee204 100644 (file)
--- a/web/admin/product/admin_product_edit.xhtml
+++ b/web/admin/product/admin_product_edit.xhtml
@@ -9,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_PRODUCT}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_PRODUCT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_EDIT_PRODUCT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_PRODUCT}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/admin/product/admin_product_list.xhtml b/web/admin/product/admin_product_list.xhtml
index 9d7a860dcca516740127a66923ef6475a0c68253..97cd4c991e0331775147f89f37c032f95b51fce9 100644 (file)
--- a/web/admin/product/admin_product_list.xhtml
+++ b/web/admin/product/admin_product_list.xhtml
@@ -9,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_PRODUCTS}</ui:define>
+               <ui:define name="admin_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_ADMIN_PRODUCTS}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_ADMIN_PRODUCTS}
+                       <h:outputText value="#{msg.CONTENT_TITLE_ADMIN_PRODUCTS}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/basket.xhtml b/web/basket.xhtml
index f90436fa27e296da1e1d6cb9301536e6c106145f..14d7ad1987fc79ed2f58ec7e2b4a93827cdff30d 100644 (file)
--- a/web/basket.xhtml
+++ b/web/basket.xhtml
@@ -9,24 +9,30 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_BASKET}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_SHOW_BASKET}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_SHOW_BASKET}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_SHOW_BASKET}" />
                </ui:define>
 
                <ui:define name="content">
                        <h:dataTable id="table_show_basket" var="item" value="#{basketController.allItems()}" styleClass="table" summary="#{msg.TABLE_SUMMARY_SHOW_BASKET}" rendered="#{basketController.hasItems()}">
                                <h:column>
-                                       <f:facet name="header">#{msg.GUEST_ITEM_TITLE}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.GUEST_ITEM_TITLE}" />
+                                       </f:facet>
 
                                        <ui:fragment rendered="#{item.isProductType()}">
-                                               #{item.itemProduct.productTitle}
+                                               <h:outputText value="#{item.itemProduct.productTitle}" />
                                        </ui:fragment>
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.SINGLE_PRODUCT_PRICE}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.SINGLE_PRODUCT_PRICE}" />
+                                       </f:facet>
 
                                        <div class="item_price">
                                                <ui:fragment rendered="#{item.isProductType()}">
@@ -38,7 +44,9 @@
                                </h:column>
 
                                <h:column>
-                                       <f:facet name="header">#{msg.CHANGE_ITEM_AMOUNT}</f:facet>
+                                       <f:facet name="header">
+                                               <h:outputText value="#{msg.CHANGE_ITEM_AMOUNT}" />
+                                       </f:facet>
 
                                        <h:form id="add_item">
                                                <h:commandButton class="submit" id="add" value="#{msg.BUTTON_CHANGE_ITEM_AMOUNT}" action="#{basketController.doChangeItem(item)}" title="#{msg.BUTTON_TITLE_CHANGE_ITEM_AMOUNT}" />

diff --git a/web/customer/checkout.xhtml b/web/customer/checkout.xhtml
index ec46f3c81c0cb9c52f2458fd7ad55027717eb3c0..4407e154817bc2f228cdbc7ceff7d95bf90551bb 100644 (file)
--- a/web/customer/checkout.xhtml
+++ b/web/customer/checkout.xhtml
@@ -9,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_CHECKOUT}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_CUSTOMER_CHECKOUT}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT}
+                       <h:outputText value="#{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT}" />
                </ui:define>
 
                <ui:define name="content">
@@ -24,14 +26,14 @@
 
                        <div class="checkout_outer">
                                <div class="checkout_title">
-                                       #{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT}
+                                       <h:outputText value="#{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT}" />
                                </div>
 
                                <div class="checkout_options">
                                        <ul>
                                                <li>
                                                        <div class="checkout_option_title">
-                                                               #{msg.CUSTOMER_CHECKOUT_OPTION1_TITLE}
+                                                               <h:outputText value="#{msg.CUSTOMER_CHECKOUT_OPTION1_TITLE}" />
                                                        </div>
 
                                                        <div class="checkout_option_content">
@@ -43,7 +45,7 @@
 
                                                <li>
                                                        <div class="checkout_option_title">
-                                                               #{msg.CUSTOMER_CHECKOUT_OPTION2_TITLE}
+                                                               <h:outputText value="#{msg.CUSTOMER_CHECKOUT_OPTION2_TITLE}" />
                                                        </div>
 
                                                        <div class="checkout_option_content">
@@ -55,7 +57,7 @@
 
                                                <li>
                                                        <div class="checkout_option_title">
-                                                               #{msg.CUSTOMER_CHECKOUT_OPTION3_TITLE}
+                                                               <h:outputText value="#{msg.CUSTOMER_CHECKOUT_OPTION3_TITLE}" />
                                                        </div>
 
                                                        <div class="checkout_option_content">

diff --git a/web/customer/checkout2.xhtml b/web/customer/checkout2.xhtml
index 99ce54b7e5a1a1295b7af9baedbef2d84c5f742d..fa688bc28fc9973bee9699ddac4c9827510a988e 100644 (file)
--- a/web/customer/checkout2.xhtml
+++ b/web/customer/checkout2.xhtml
@@ -9,10 +9,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_CHECKOUT2}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_CHECKOUT2}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_INDEX_CHECKOUT2}
+                       <h:outputText value="#{msg.CONTENT_TITLE_INDEX_CHECKOUT2}" />
                </ui:define>
 
                <ui:define name="content">
@@ -24,19 +26,20 @@
 
                        <div class="checkout_outer">
                                <div class="checkout_title">
-                                       #{msg.GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE}
+                                       <h:outputText value="#{msg.GUEST_CHECKOUT_WITHOUT_REGISTRATION_TITLE}" />
                                </div>
 
                                <div class="registration_form">
                                        <h:form id="checkout_form">
                                                <div class="table">
                                                        <div class="table_header">
-                                                               #{msg.GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE}
+                                                               <h:outputText value="#{msg.GUEST_PAYMENT_WITHOUT_REGISTRATION_TITLE}" />
                                                        </div>
 
                                                        <ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
 
                                                        <div class="para">
+                                                               <!-- @TODO Move this to i18n bundle //-->
                                                                Derzeit ist nur eine Bezahlung gegen Rechnung möglich.
                                                        </div>
 

diff --git a/web/customer/checkout_done.xhtml b/web/customer/checkout_done.xhtml
index 24e931c99931b2be31d57dd66778ebe8ff78dd93..22fdce63c48695f1cd2e97d93a93d2d726aa7df9 100644 (file)
--- a/web/customer/checkout_done.xhtml
+++ b/web/customer/checkout_done.xhtml
@@ -9,13 +9,16 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_CHECKOUT_DONE}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_CUSTOMER_CHECKOUT_DONE}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT_DONE}
+                       <h:outputText value="#{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT_DONE}" />
                </ui:define>
 
                <ui:define name="content">
+                       <!-- @TODO Move this to i18n bundle //-->
                        Rechnung abrufen:
                        <h:link class="receipt_link" id="receipt" outcome="pdf" value="#{msg.LINK_OPEN_RECEIPT}" target="_blank">
                                <f:param name="customer" value="#{checkoutController.customer.customerId}" />

diff --git a/web/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml
index 382a2f79520d022ecc14e510bcf92422e96975b0..a80d0bb666d329d942b8a3cfdbcd946fe9a27f33 100644 (file)
--- a/web/customer/empty_basket.xhtml
+++ b/web/customer/empty_basket.xhtml
@@ -8,10 +8,12 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_CUSTOMER_EMPTY_BASKET}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_CUSTOMER_EMPTY_BASKET}" />
+               </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_CUSTOMER_EMPTY_BASKET}
+                       <h:outputText value="#{msg.CONTENT_TITLE_CUSTOMER_EMPTY_BASKET}" />
                </ui:define>
 
                <ui:define name="content">

diff --git a/web/item_added.xhtml b/web/item_added.xhtml
index 80ba7bc6ccaa1ccd28f8dc52139f81df77763007..497e532064daeb35ce87fc376a559d131318a258 100644 (file)
--- a/web/item_added.xhtml
+++ b/web/item_added.xhtml
@@ -8,7 +8,9 @@
        >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_ITEM_ADDED}</ui:define>
+               <ui:define name="guest_title">
+                       <h:outputText value="#{msg.PAGE_TITLE_INDEX_ITEM_ADDED}" />
+               </ui:define>
 
                <ui:define name="content_header">
                        <h:outputText value="#{msg.CONTENT_TITLE_INDEX_ITEM_ADDED}" />