Don't cherry-pick:

- _HEADER is now everwhere a suffix, not 2nd prefix of i18n keys

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

diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index f6d3dfef090418ebfa9c17cd2988f2d375234288..19e65f7b9390413b9cac4b5dbd236505c2e14503 100644 (file)
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -47,7 +47,7 @@
                                        </p:panelGrid >
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{receipt.receiptId}" filterBy="#{receipt.receiptId}">
+                               <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{receipt.receiptId}" filterBy="#{receipt.receiptId}">
                                        <p:link outcome="admin_show_receipt" title="#{project.ADMIN_LINK_SHOW_RECEIPT_TITLE}" value="#{receipt.receiptId}">
                                                <f:param name="receiptId" value="#{receipt.receiptId}" />
                                        </p:link>
@@ -99,7 +99,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ASSIGNED_USER}" sortBy="#{receipt.receiptUser}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
+                               <p:column headerText="#{msg.ADMIN_ASSIGNED_USER_HEADER}" sortBy="#{receipt.receiptUser}" filterBy="#{receipt.receiptUser}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -148,7 +148,7 @@
                                        <h:outputText value="#{msg[receipt.receiptPaymentType.i18nKey]}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
                                        <pl:outputReceiptAdminMiniLinks receipt="#{receipt}" />
                                </p:column>
                        </p:dataTable>

diff --git a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
index 81c39951809b581061817e589087638af039ac96..1265d4f77e293848548a8fad4c37332c08bba3e5 100644 (file)
--- a/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
+++ b/web/admin/financial/receipt_item/admin_receipt_item_list.xhtml
@@ -49,7 +49,7 @@
                                        </p:panelGrid >
                                </f:facet>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ID_NUMBER}" sortBy="#{receiptItem.itemId}" filterBy="#{receiptItem.itemId}">
+                               <p:column headerText="#{msg.ID_NUMBER_HEADER}" sortBy="#{receiptItem.itemId}" filterBy="#{receiptItem.itemId}">
                                        <p:link outcome="admin_show_receipt_item" title="#{project.ADMIN_LINK_SHOW_RECEIPT_ITEM_TITLE}" value="#{receiptItem.itemId}">
                                                <f:param name="receiptId" value="#{receiptItem.itemId}" />
                                        </p:link>
@@ -97,7 +97,7 @@
                                        </p:link>
                                </p:column>
 
-                               <p:column headerText="#{project.ADMIN_HEADER_RECEIPT_ITEM_MANUFACTURER_NAME}" sortBy="#{item.itemManufacturer.companyName}" filterBy="#{item.itemManufacturer}" filterMatchMode="in">
+                               <p:column headerText="#{project.ADMIN_RECEIPT_ITEM_MANUFACTURER_NAME_HEADER}" sortBy="#{item.itemManufacturer.companyName}" filterBy="#{item.itemManufacturer}" filterMatchMode="in">
                                        <f:facet name="filter">
                                                <p:selectCheckboxMenu
                                                        filter="true"
@@ -127,13 +127,13 @@
                                        <h:outputText value="#{msg.ADMIN_NOT_ASSIGNED}" title="#{project.ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE}" rendered="#{empty item.itemManufacturer}" />
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ENTRY_CREATED}" sortBy="#{receipt.receiptCreated}" filterable="false">
+                               <p:column headerText="#{msg.ENTRY_CREATED_HEADER}" sortBy="#{receipt.receiptCreated}" filterable="false">
                                        <h:outputText id="itemCreated" value="#{receiptItem.itemCreated.time}">
                                                <f:convertDateTime for="itemCreated" type="both" timeStyle="short" dateStyle="short" />
                                        </h:outputText>
                                </p:column>
 
-                               <p:column headerText="#{msg.ADMIN_HEADER_ACTION_LINKS}" sortable="false">
+                               <p:column headerText="#{msg.ADMIN_ACTION_LINKS_HEADER}" sortable="false">
                                        <pl:outputReceiptItemAdminMiniLinks receiptItem="#{receiptItem}" />
                                </p:column>
                        </p:dataTable>