From: Roland Häder <roland@mxchange.org>
Date: Sun, 19 Apr 2020 04:04:56 +0000 (+0200)
Subject: Don't cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1f8e25d4899792f0d355eb3637c40b11a9c11bba;p=jfinancials-war.git

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 ab44871d..8f6e1228 100644
--- 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 6a8733d2..ab4331bb 100644
--- 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 949a7075..ad8f0985 100644
--- 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 89099405..62cb94ed 100644
--- 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}">