used more <h:outputText value="#{msg.BLA_MESSAGE}" /> instead of directly having...

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

diff --git a/web/admin/category/admin_category_list.xhtml b/web/admin/category/admin_category_list.xhtml
index 26edf0483661749cd2c04676b7adf7d7456d2740..2075c2c96b9805a67e3517d1dd8ebbe819458403 100644 (file)
--- a/web/admin/category/admin_category_list.xhtml
+++ b/web/admin/category/admin_category_list.xhtml
@@ -19,20 +19,29 @@
                        <div class="para">
                                <h:dataTable id="categories" var="cat" value="#{categoryController.allCategories}" styleClass="table" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_CATEGORY}">
                                        <h:column>
-                                               <f:facet name="header">#{msg.ADMIN_CATEGORY_ID}</f:facet>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_CATEGORY_ID}" />
+                                               </f:facet>
+
                                                <h:link outcome="admin_edit_category" title="#{msg.ADMIN_LINK_EDIT_DELETE_CATEGORY_TITLE}" value="#{cat.categoryId}">
                                                        <f:param name="categoryId" value="#{cat.categoryId}" />
                                                </h:link>
                                        </h:column>
 
                                        <h:column>
-                                               <f:facet name="header">#{msg.ADMIN_ENTER_CATEGORY_TITLE}</f:facet>
-                                                       #{cat.categoryTitle}
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_ENTER_CATEGORY_TITLE}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{cat.categoryTitle}" />
                                        </h:column>
 
                                        <h:column>
-                                               <f:facet name="header">#{msg.ADMIN_PARENT_CATEGORY}</f:facet>
-                                                       #{cat.parentCategory.categoryId}
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_PARENT_CATEGORY}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{cat.parentCategory.categoryId}" />
                                        </h:column>
                                </h:dataTable>
                        </div>
@@ -41,16 +50,21 @@
                                <h:form id="add_category">
                                        <div class="table">
                                                <div class="table_header">
-                                                       #{msg.ADMIN_ADD_CATEGORY_TITLE}
+                                                       <h:outputText value="#{msg.ADMIN_ADD_CATEGORY_TITLE}" />
                                                </div>
 
                                                <fieldset id="product_data">
-                                                       <legend>#{msg.PLEASE_FILL_ALL_FIELDS}</legend>
+                                                       <legend>
+                                                               <h:outputText value="#{msg.PLEASE_FILL_ALL_FIELDS}" />
+                                                       </legend>
 
                                                        <div class="table_row">
                                                                <div class="table_left">
-                                                                       #{msg.ADMIN_ENTER_CATEGORY_TITLE}
-                                                                       <div class="tiny">#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}</div>
+                                                                       <h:outputText value="#{msg.ADMIN_ENTER_CATEGORY_TITLE}" />
+
+                                                                       <div class="tiny">
+                                                                               <h:outputText value="#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE}" />
+                                                                       </div>
                                                                </div>
 
                                                                <div class="table_right">
@@ -62,7 +76,7 @@
 
                                                        <div class="table_row">
                                                                <div class="table_left">
-                                                                       #{msg.ADMIN_PARENT_CATEGORY}
+                                                                       <h:outputText value="#{msg.ADMIN_PARENT_CATEGORY}" />
                                                                </div>
 
                                                                <div class="table_right">

diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index af009469bc7f812e4207d3600035f20bdff8a244..21816e6d070c59c9ea65bb91785af08386fd3d70 100644 (file)
--- 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 1e43fcde95d2b01b2125316fd579049e5ead7f99..af2c2af18dc726302e00762901b37bd16ac0bca1 100644 (file)
--- 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 73737268ab3cd7d923e1d0df58c1d50108423235..102d02fc954808436518c24a461645fbd1c862cd 100644 (file)
--- 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 ebb50f9447b3b7b9dc32d5522d853cdce755777e..dbd277520f138b8e95d2d9c5b8f42636fe0c0a8f 100644 (file)
--- 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/product/admin_product_list.xhtml b/web/admin/product/admin_product_list.xhtml
index e3dc4f74e454bdf9ba32610e530663f28fe5d560..9d7a860dcca516740127a66923ef6475a0c68253 100644 (file)
--- a/web/admin/product/admin_product_list.xhtml
+++ b/web/admin/product/admin_product_list.xhtml
@@ -19,30 +19,45 @@
                        <div class="para">
                                <h:dataTable id="product_table" var="product" value="#{adminProductController.allProducts}" styleClass="table" summary="#{msg.TABLE_SUMMARY_ADMIN_PRODUCTS}">
                                        <h:column>
-                                               <f:facet name="header">#{msg.ADMIN_TITLE_PRODUCT_NUMBER}</f:facet>
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_TITLE_PRODUCT_NUMBER}" />
+                                               </f:facet>
+
                                                <h:link outcome="admin_edit_product" title="#{msg.ADMIN_LINK_EDIT_DELETE_PRODUCT_TITLE}" value="#{product.productId}">
                                                        <f:param name="productId" value="#{product.productId}" />
                                                </h:link>
                                        </h:column>
 
                                        <h:column>
-                                               <f:facet name="header">#{msg.ADMIN_TITLE_PRODUCT_TITLE}</f:facet>
-                                                       #{product.productTitle}
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.ADMIN_TITLE_PRODUCT_TITLE}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{product.productTitle}" />
                                        </h:column>
 
                                        <h:column>
-                                               <f:facet name="header">#{msg.SINGLE_PRODUCT_PRICE}</f:facet>
-                                                       #{product.productPrice}
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.SINGLE_PRODUCT_PRICE}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{product.productPrice}" />
                                        </h:column>
 
                                        <h:column>
-                                               <f:facet name="header">#{msg.CATEGORY}</f:facet>
-                                                       #{product.productCategory.categoryTitle}
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.CATEGORY}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{product.productCategory.categoryTitle}" />
                                        </h:column>
 
                                        <h:column>
-                                               <f:facet name="header">#{msg.IS_AVAILABLE}</f:facet>
-                                                       #{product.productAvailability}
+                                               <f:facet name="header">
+                                                       <h:outputText value="#{msg.IS_AVAILABLE}" />
+                                               </f:facet>
+
+                                               <h:outputText value="#{product.productAvailability}" />
                                        </h:column>
                                </h:dataTable>
                        </div>
@@ -51,16 +66,21 @@
                                <h:form id="add_product">
                                        <div class="table">
                                                <div class="table_header">
-                                                       #{msg.ADMIN_ADD_PRODUCT_TITLE}
+                                                       <h:outputText value="#{msg.ADMIN_ADD_PRODUCT_TITLE}" />
                                                </div>
 
                                                <fieldset id="product_data">
-                                                       <legend>#{msg.PLEASE_FILL_ALL_FIELDS}</legend>
+                                                       <legend>
+                                                               <h:outputText value="#{msg.PLEASE_FILL_ALL_FIELDS}" />
+                                                       </legend>
 
                                                        <div class="table_row">
                                                                <div class="table_left">
-                                                                       #{msg.ADMIN_ENTER_PRODUCT_TITLE}
-                                                                       <div class="tiny">#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE}</div>
+                                                                       <h:outputText value="#{msg.ADMIN_ENTER_PRODUCT_TITLE}" />
+
+                                                                       <div class="tiny">
+                                                                               <h:outputText value="#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE}" />
+                                                                       </div>
                                                                </div>
 
                                                                <div class="table_right">
@@ -72,8 +92,11 @@
 
                                                        <div class="table_row">
                                                                <div class="table_left">
-                                                                       #{msg.ADMIN_ENTER_SINGLE_PRODUCT_PRICE}
-                                                                       <div class="tiny">#{msg.ADMIN_ENTER_PRODUCT_PRICE_EXAMPLE}</div>
+                                                                       <h:outputText value="#{msg.ADMIN_ENTER_SINGLE_PRODUCT_PRICE}" />
+
+                                                                       <div class="tiny">
+                                                                               <h:outputText value="#{msg.ADMIN_ENTER_PRODUCT_PRICE_EXAMPLE}" />
+                                                                       </div>
                                                                </div>
 
                                                                <div class="table_right">
@@ -85,7 +108,7 @@
 
                                                        <div class="table_row">
                                                                <div class="table_left">
-                                                                       #{msg.CATEGORY}
+                                                                       <h:outputText value="#{msg.CATEGORY}" />
                                                                </div>
 
                                                                <div class="table_right">
@@ -97,7 +120,7 @@
 
                                                        <div class="table_row">
                                                                <div class="table_left">
-                                                                       #{msg.IS_AVAILABLE}
+                                                                       <h:outputText value="#{msg.IS_AVAILABLE}" />
                                                                </div>
 
                                                                <div class="table_right">
@@ -120,11 +143,11 @@
                        </div>
 
                        <div class="para">
-                               #{msg.ADMIN_ADD_PRODUCT_NOTICE_TITLE}
+                               <h:outputText value="#{msg.ADMIN_ADD_PRODUCT_NOTICE_TITLE}" />
                                <ul>
-                                       <li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE1}</li>
-                                       <li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE2}</li>
-                                       <li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE3}</li>
+                                       <li><h:outputText value="#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE1}" /></li>
+                                       <li><h:outputText value="#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE2}" /></li>
+                                       <li><h:outputText value="#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE3}" /></li>
                                </ul>
                        </div>
                </ui:define>

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index f8280a2b42b4fc59413a12453c6a16ebefede3aa..42e78ad73142918a675c1562b9a46adf8edd94f1 100644 (file)
--- 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 247245056409092cd11017a6540c3bac39c8e1af..a90b20a56e06dbab83f23a7256cebadb916d0ae0 100644 (file)
--- 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>