Don't cherry-pick:

- renamed key i18nKey to messageKey in all remaining enumerations

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

diff --git a/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java
index ab44871d540d58a79079db68e61a936150807490..8f6e12285f0ff5b71ca593acf6cc64d4546121f7 100644 (file)
--- a/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/helper/receipt/FinancialsWebViewReceiptHelperBean.java
@@ -61,7 +61,7 @@ public class FinancialsWebViewReceiptHelperBean extends BaseFinancialsBean imple
                        sb.append(this.getMessageFromBundle("RECEIPT_ISSUED")).append(" "); //NOI18N
                        sb.append(DateFormat.getInstance().format(receipt.getReceiptIssued())).append(", "); //NOI18N
                        sb.append(this.getMessageFromBundle("PAYMENT_TYPE")).append(" "); //NOI18N
-                       sb.append(this.getMessageFromBundle(receipt.getReceiptPaymentType().getI18nKey()));
+                       sb.append(this.getMessageFromBundle(receipt.getReceiptPaymentType().getMessageKey()));
 
                        // Is receipt number included?
                        if (receipt.getReceiptNumber() != null) {

diff --git a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
index 6a8733d27f5864ccaef687c848fe91aa87ce7281..ab4331bb0ac8a05e394663a7e26fdd048040045c 100644 (file)
--- a/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/admin/financial/receipt/admin_form_financial_receipt.tpl
@@ -71,7 +71,7 @@
                                        value="#{dataController.paymentTypes}"
                                        var="paymentType"
                                        itemValue="#{paymentType}"
-                                       itemLabel="#{msg[paymentType.i18nKey]}"
+                                       itemLabel="#{msg[paymentType.messageKey]}"
                                        />
                        </p:selectOneMenu>
 

diff --git a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
index 949a70753dc65628652398ee15f94101b9f22974..ad8f09855f161b4eb6554d6d9c884b540e2a44d0 100644 (file)
--- a/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
+++ b/web/WEB-INF/templates/user/financial/receipt/login_form_financial_receipt.tpl
@@ -72,7 +72,7 @@
                                        value="#{dataController.paymentTypes}"
                                        var="receiptPaymentType"
                                        itemValue="#{paymentType}"
-                                       itemLabel="#{msg[paymentType.i18nKey]}"
+                                       itemLabel="#{msg[paymentType.messageKey]}"
                                        />
                        </p:selectOneMenu>
                        <p:message for="receiptPaymentType" />

diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index 890994059c9a746fe906d821a3b7467ef64c5ca6..62cb94edae3b49be24863004f97ced3c2cecf539 100644 (file)
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -271,12 +271,12 @@
                                                                value="#{dataController.paymentTypes}"
                                                                var="paymentType"
                                                                itemValue="#{paymentType}"
-                                                               itemLabel="#{msg[paymentType.i18nKey]}"
+                                                               itemLabel="#{msg[paymentType.messageKey]}"
                                                                />
                                                </p:selectCheckboxMenu>
                                        </f:facet>
 
-                                       <h:outputText value="#{msg[receipt.receiptPaymentType.i18nKey]}" />
+                                       <h:outputText value="#{msg[receipt.receiptPaymentType.messageKey]}" />
                                </p:column>
 
                                <p:column
@@ -385,7 +385,7 @@
                                                <h:outputText value="#{receiptListController.selectedReceipt.receiptSequenceNumber}" />
 
                                                <p:outputLabel value="#{msg.PAYMENT_TYPE}" title="#{project.RECEIPT_PAYMENT_TYPE_TITLE}" />
-                                               <h:outputText value="#{msg[receiptListController.selectedReceipt.receiptPaymentType.i18nKey]}" />
+                                               <h:outputText value="#{msg[receiptListController.selectedReceipt.receiptPaymentType.messageKey]}" />
 
                                                <p:outputLabel value="#{msg.ENTRY_CREATED_HEADER}" title="#{project.RECEIPT_ENTRY_CREATED_TITLE}" />
                                                <h:outputText value="#{receiptListController.selectedReceipt.receiptCreated}">