From 6f42837ac22cb38ba115069ba7a0e72324416ef8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 20 May 2016 17:54:59 +0200
Subject: [PATCH] used more <h:outputText value="#{msg.BLA_MESSAGE}" /> instead
 of directly having it in JSF page
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/admin/contact/admin_contact_export.xhtml  |  2 +-
 web/admin/contact/admin_contact_list.xhtml    | 26 +++++++++----
 web/admin/country/admin_country_list.xhtml    | 22 +++++++----
 .../admin_mobile_provider_list.xhtml          | 26 +++++++++----
 web/admin/user/admin_user_list.xhtml          | 38 ++++++++++++++-----
 web/guest/user/user_profile.xhtml             |  6 +--
 6 files changed, 83 insertions(+), 37 deletions(-)

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index af009469..21816e6d 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -156,7 +156,7 @@
 
 				<div class="table_medium">
 					<div class="table_header">
-						#{msg.ADMIN_EXPORT_CONTACTS_TITLE}
+						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
 					</div>
 
 					<div class="para">
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 1e43fcde..af2c2af1 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -18,7 +18,9 @@
 		<ui:define name="content">
 			<h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{contactController.hasContacts()}">
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_CONTACT_ID}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
+					</f:facet>
 
 					<h:link outcome="admin_show_contact" title="#{msg.ADMIN_LINK_SHOW_CONTACT_TITLE}" value="#{contact.contactId}">
 						<f:param name="contactId" value="#{contact.contactId}" />
@@ -26,31 +28,41 @@
 				</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[contact.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="#{contact.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="#{contact.contactFamilyName}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_CONTACT_USAGE}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_CONTACT_USAGE}" />
+					</f:facet>
 
 					<h:outputText value="#{msg[beanHelper.getContactUsageMessageKey(contact)]}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_CONTACT_CREATED}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_CONTACT_CREATED}" />
+					</f:facet>
 
 					<h:outputText id="contactCreated" value="#{contact.contactCreated.time}">
 						<f:convertDateTime for="contactCreated" type="both" timeStyle="short" dateStyle="short" />
@@ -61,7 +73,7 @@
 			<div class="table_medium">
 				<h:form id="admin_add_contact">
 					<div class="table_header">
-						#{msg.ADMIN_ADD_CONTACT_TITLE}
+						<h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
 					</div>
 
 					<div class="para">
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 73737268..102d02fc 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -18,7 +18,9 @@
 		<ui:define name="content">
 			<h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{countryController.hasCountries()}">
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}" />
+					</f:facet>
 
 					<h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
 						<f:param name="countryId" value="#{country.countryId}" />
@@ -26,19 +28,25 @@
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}" />
+					</f:facet>
 
 					<h:outputText value="#{country.countryCode}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
+					</f:facet>
 
 					<h:outputText value="#{country.countryExternalDialPrefix}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}" />
+					</f:facet>
 
 					<h:outputText value="#{msg[country.countryI18nkey]}" />
 				</h:column>
@@ -47,7 +55,7 @@
 			<h:form id="form_add_country">
 				<div class="table_medium">
 					<div class="table_header">
-						#{msg.ADMIN_ADD_COUNTRY_TITLE}
+						<h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
 					</div>
 
 					<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
@@ -59,9 +67,9 @@
 				</div>
 
 				<div class="para notice">
-					#{msg.ADMIN_ADD_COUNTRY_NOTICES}
+					<h:outputText value="#{msg.ADMIN_ADD_COUNTRY_NOTICES}" />
 					<ul>
-						<li>#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}</li>
+						<li><h:outputText value="#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}" /></li>
 					</ul>
 				</div>
 			</h:form>
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index ebb50f94..dbd27752 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -18,7 +18,9 @@
 		<ui:define name="content">
 			<h:dataTable id="table_list_mobile" var="mobile" value="#{mobileProviderController.allMobileProvider()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{mobileProviderController.hasMobileProvider()}">
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}" />
+					</f:facet>
 
 					<h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
 						<f:param name="providerId" value="#{mobile.providerId}" />
@@ -26,25 +28,33 @@
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}" />
+					</f:facet>
 
 					<h:outputText value="#{mobile.providerName}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}" />
+					</f:facet>
 
 					<h:outputText value="#{mobile.providerDialPrefix}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}" />
+					</f:facet>
 
 					<h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}" />
+					</f:facet>
 
 					<h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
 						<f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
@@ -55,7 +65,7 @@
 			<h:form id="form_add_mobile_provider">
 				<div class="table_medium">
 					<div class="table_header">
-						#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}
+						<h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
 					</div>
 
 					<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
@@ -67,9 +77,9 @@
 				</div>
 
 				<div class="para notice">
-					#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}
+					<h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}" />
 					<ul>
-						<li>#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}</li>
+						<li><h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}" /></li>
 					</ul>
 				</div>
 			</h:form>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 236c3824..a09a882a 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -18,7 +18,9 @@
 		<ui:define name="content">
 			<h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{userController.hasUsers()}">
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_USER_ID}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
+					</f:facet>
 
 					<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
 						<f:param name="userId" value="#{user.userId}" />
@@ -26,43 +28,57 @@
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_USER_NAME}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />
+					</f:facet>
 
 					<h:outputText value="#{user.userName}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_CONTACT_GENDER}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_GENDER}" />
+					</f:facet>
 
 					<h:outputText value="#{msg[user.userContact.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_LIST_USER_FIRST_NAME}" />
+					</f:facet>
 
 					<h:outputText value="#{user.userContact.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_LIST_USER_FAMILY_NAME}" />
+					</f:facet>
 
 					<h:outputText value="#{user.userContact.contactFamilyName}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_USER_ACCOUNT_STATUS}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_ACCOUNT_STATUS}" />
+					</f:facet>
 
 					<h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_USER_PROFILE_MODE}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_PROFILE_MODE}" />
+					</f:facet>
 
 					<h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.ADMIN_USER_CREATED}</f:facet>
+					<f:facet name="header">
+						<h:outputText value="#{msg.ADMIN_LIST_USER_CREATED}" />
+					</f:facet>
 
 					<h:outputText id="userCreated" value="#{user.userCreated.time}">
 						<f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
@@ -73,12 +89,14 @@
 			<div class="table_medium">
 				<h:form id="admin_add_user">
 					<div class="table_header">
-						#{msg.ADMIN_ADD_USER_TITLE}
+						<h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
 					</div>
 
 					<div class="para">
 						<fieldset id="user_contact">
-							<legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}</legend>
+							<legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
+								<h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
+							</legend>
 
 							<div class="table_row">
 								<div class="table_left_medium">
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 24724505..a90b20a5 100644
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -28,15 +28,13 @@
 					<ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
 				</ui:fragment>
 
-				<ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
-					#{msg.ERROR_PROFILE_NOT_VISIBLE}
-				</ui:fragment>
+				<h:outputText value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
 
 				<ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
 					<div align="center">
 						<h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
 							<f:facet name="header">
-								#{msg.PUBLIC_USER_PROFILE}
+								<h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
 							</f:facet>
 						</h:panelGrid>
 					</div>
-- 
2.39.5