From 13d3c774cae6d447844cc26a3073b4f276b2d321 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 19 Apr 2020 06:04:27 +0200 Subject: [PATCH] Product-only: - 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/product/FinancialsProductWebViewHelperBean.java | 2 +- .../admin/generic_product/admin_form_generic_product_data.tpl | 2 +- web/admin/generic_product/admin_generic_product_list.xhtml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/org/mxchange/jfinancials/beans/helper/product/FinancialsProductWebViewHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/product/FinancialsProductWebViewHelperBean.java index 912fc73d..c70530ac 100644 --- a/src/java/org/mxchange/jfinancials/beans/helper/product/FinancialsProductWebViewHelperBean.java +++ b/src/java/org/mxchange/jfinancials/beans/helper/product/FinancialsProductWebViewHelperBean.java @@ -86,7 +86,7 @@ public class FinancialsProductWebViewHelperBean extends BaseFinancialsBean imple // Is there any age group? if (product.getProductAgeGroup() != null) { // Show it - sb.append(", ").append(this.getMessageFromBundle(product.getProductAgeGroup().getI18nKey())); //NOI18N + sb.append(", ").append(this.getMessageFromBundle(product.getProductAgeGroup().getMessageKey())); //NOI18N } // Is there any size? diff --git a/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl b/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl index 3d0c8231..1c4903cf 100644 --- a/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl +++ b/web/WEB-INF/templates/admin/generic_product/admin_form_generic_product_data.tpl @@ -89,7 +89,7 @@ value="#{dataController.ageGroups}" var="ageGroup" itemValue="#{ageGroup}" - itemLabel="#{project[ageGroup.i18nKey]}" + itemLabel="#{project[ageGroup.messageKey]}" /> diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml index 4f6c290f..1c9ed323 100644 --- a/web/admin/generic_product/admin_generic_product_list.xhtml +++ b/web/admin/generic_product/admin_generic_product_list.xhtml @@ -321,8 +321,8 @@ - - + + -- 2.39.5