Product-only:

- 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/product/FinancialsProductWebViewHelperBean.java b/src/java/org/mxchange/jfinancials/beans/helper/product/FinancialsProductWebViewHelperBean.java
index 912fc73de2aceabb72d3c856038ee46d23977d44..c70530ac3413b90089f212d7218b3a0e2942fe6e 100644 (file)
--- 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 3d0c82311bfeacd807c4b6f424dc97101a68bbec..1c4903cf655929bc687e03747d8c23bc3d8e63ec 100644 (file)
--- 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]}"
                                        />
                        </p:selectOneMenu>
 

diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index 4f6c290f86a08cc881bcda5371bc37913107e899..1c9ed323ec53fbf8de559a5c1443a4266e2841ec 100644 (file)
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -321,8 +321,8 @@
                                                <h:outputText value="#{productListController.selectedProduct.productAvailability ? msg.CHOICE_YES : msg.CHOICE_NO}" />
 
                                                <p:outputLabel value="#{product.AGE_GROUP_HEADER}" title="#{product.PRODUCT_AGE_GROUP_TITLE}" />
-                                               <h:outputText value="#{project[productListController.selectedProduct.productAgeGroup.i18nKey]}" title="#{productListController.selectedProduct.productAgeGroup.i18nKey}" rendered="#{not empty productListController.selectedProduct.productAgeGroup.i18nKey}" />
-                                               <h:outputText value="#{product.PRODUCT_HAS_NO_AGE_GROUP}" rendered="#{empty productListController.selectedProduct.productAgeGroup.i18nKey}" />
+                                               <h:outputText value="#{project[productListController.selectedProduct.productAgeGroup.messageKey]}" title="#{productListController.selectedProduct.productAgeGroup.messageKey}" rendered="#{not empty productListController.selectedProduct.productAgeGroup.messageKey}" />
+                                               <h:outputText value="#{product.PRODUCT_HAS_NO_AGE_GROUP}" rendered="#{empty productListController.selectedProduct.productAgeGroup.messageKey}" />
 
                                                <p:outputLabel value="#{product.CURRENCY_CODE_HEADER}" title="#{product.PRODUCT_CURRENCY_CODE_TITLE}" />
                                                <h:outputText value="#{productListController.selectedProduct.productCurrencyCode}" />