From 1f8e25d4899792f0d355eb3637c40b11a9c11bba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 19 Apr 2020 06:04:56 +0200 Subject: [PATCH] Don't cherry-pick: - renamed key i18nKey to messageKey in all remaining enumerations MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../helper/receipt/FinancialsWebViewReceiptHelperBean.java | 2 +- .../financial/receipt/admin_form_financial_receipt.tpl | 2 +- .../user/financial/receipt/login_form_financial_receipt.tpl | 2 +- web/admin/financial/receipt/admin_receipt_list.xhtml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) 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]}" /> 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]}" /> 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]}" /> - + - + -- 2.39.5