From 373aaf4e6cdeb364ef0c38fb8fa9e52182624c8a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 19 Apr 2017 18:08:37 +0200
Subject: [PATCH] Don't cherry-pick: - text needs to be wrapped into
 h:outputText
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../admin_form_customer_personal_data.tpl     |  2 +-
 .../category/admin_category_delete.xhtml      |  6 ++-
 web/admin/category/admin_category_edit.xhtml  |  6 ++-
 web/admin/category/admin_category_list.xhtml  |  6 ++-
 .../customer/admin_customer_delete.xhtml      |  6 ++-
 web/admin/customer/admin_customer_edit.xhtml  | 10 +++--
 web/admin/customer/admin_customer_list.xhtml  | 40 ++++++++++++++-----
 web/admin/customer/admin_customer_show.xhtml  |  6 ++-
 .../customer/admin_customer_unlock.xhtml      |  6 ++-
 web/admin/product/admin_product_delete.xhtml  |  6 ++-
 web/admin/product/admin_product_edit.xhtml    |  6 ++-
 web/admin/product/admin_product_list.xhtml    |  6 ++-
 web/basket.xhtml                              | 20 +++++++---
 web/customer/checkout.xhtml                   | 14 ++++---
 web/customer/checkout2.xhtml                  | 11 +++--
 web/customer/checkout_done.xhtml              |  7 +++-
 web/customer/empty_basket.xhtml               |  6 ++-
 web/item_added.xhtml                          |  4 +-
 18 files changed, 113 insertions(+), 55 deletions(-)

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 f086074f..611bc729 100644
--- 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 aa778a56..6e5222a0 100644
--- 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 9fb8d65d..121d2c01 100644
--- 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 2075c2c9..a0564035 100644
--- 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 8dcdbfb1..82486e52 100644
--- 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 3bd118ae..f5055eea 100644
--- 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 6f49bfc3..66588a34 100644
--- 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 8724d2ef..6ac86c02 100644
--- 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 f39ae0e6..167384ce 100644
--- 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 a76437b6..66be5e16 100644
--- 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 8170d369..3687dcce 100644
--- 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 9d7a860d..97cd4c99 100644
--- 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 f90436fa..14d7ad19 100644
--- 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 ec46f3c8..4407e154 100644
--- 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 99ce54b7..fa688bc2 100644
--- 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 24e931c9..22fdce63 100644
--- 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 382a2f79..a80d0bb6 100644
--- 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 80ba7bc6..497e5320 100644
--- 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}" />
-- 
2.39.5