Don't cherry-pick:

- moved i18n BARCODE_NUMBER_HEADER to project file
- also renamed it to BARCODE_HEADER as the actual bar code is being rendered
- added missing i18n strings

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

diff --git a/src/java/org/mxchange/localization/product_de_DE.properties b/src/java/org/mxchange/localization/product_de_DE.properties
index ba8ae6d1da1c84d901c222000cb5274f49feaaab..f1378fcf280c5c8bf5f21250a3756ea578beecf8 100644 (file)
--- a/src/java/org/mxchange/localization/product_de_DE.properties
+++ b/src/java/org/mxchange/localization/product_de_DE.properties
@@ -186,7 +186,6 @@ BUTTON_ADMIN_EDIT_GENERIC_PRODUCT=Allgemeines Produkt \u00e4ndern
 ADMIN_PRODUCT_NUMBER_HEADER=Produktnummer:
 ADMIN_NO_PRODUCT_NUMBER_ASSIGNED=Keine Produktnummer zugewiesen.
 ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER=Geben Sie die Balkencodenummer des Produktes ein:
-BARCODE_NUMBER_HEADER=Barcode-Nummer:
 PRODUCT_NO_BARCODE_NUMBER_ASSIGNED=Das Produkt hat keine Barcode-Nummer zugewiesen.
 PRODUCT_BARCODE_NUMBER_TITLE=Barcode Nummer des Produktes.
 ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Daten zur Produktkategorie:

diff --git a/src/java/org/mxchange/localization/product_en_US.properties b/src/java/org/mxchange/localization/product_en_US.properties
index 5563a5cfb181c821bbc4792a0ede9a63e09b3e5b..32319b1591b7df15bc3604e9747062770228ac73 100644 (file)
--- a/src/java/org/mxchange/localization/product_en_US.properties
+++ b/src/java/org/mxchange/localization/product_en_US.properties
@@ -150,7 +150,6 @@ BUTTON_ADMIN_EDIT_GENERIC_PRODUCT=Change generic product
 ADMIN_PRODUCT_NUMBER_HEADER=Product number:
 ADMIN_NO_PRODUCT_NUMBER_ASSIGNED=No product number assigned.
 ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER=Enter product's barcode number:
-BARCODE_NUMBER_HEADER=Barcode number:
 PRODUCT_NO_BARCODE_NUMBER_ASSIGNED=Product has no bar-code number assigned.
 PRODUCT_BARCODE_NUMBER_TITLE=Bar-code number of product.
 ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Data of product category:

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index b1c9e59a5bdd826f501cd0161eb5a9c192a9f236..344234154fd174b05c1d65e91233fda7cbbd46bd 100644 (file)
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -202,3 +202,5 @@ RECEIPT_RESUMPTION_OF_HEADER=Wiederaufnahme des Kassenbons:
 ASSIGNED_RECEIPT_RESUMPTION_OF_TITLE=Kassenbon, der mit diesem Kassenbon wiederaufgenommen wurde.
 ADMIN_LINK_SHOW_RECEIPT_RESUMPTION_OF_TITLE=Zeit den Kassenbon an, der mit diesem wieder aufgenommen wurde.
 NO_RESUMED_RECEIPT_ASSIGNED_TO_RECEIPT=Es wurde kein Kassenbon mit diesem wieder aufgenommen.
+BARCODE_HEADER=Barcode:
+QRCODE_HEADER=QR-Code:

diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index 9e2ad4a96c17bbd5521dab017dc4bdc14f0e1ebb..603902d864a0e6246c2b3882df0a14d778c35707 100644 (file)
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -171,3 +171,5 @@ RECEIPT_RESUMPTION_OF_HEADER=Resumption of receipt:
 ASSIGNED_RECEIPT_RESUMPTION_OF_TITLE=Receipt has has been resumed with this receipt.
 ADMIN_LINK_SHOW_RECEIPT_RESUMPTION_OF_TITLE=Shows the resumed receipt by this receipt.
 NO_RESUMED_RECEIPT_ASSIGNED_TO_RECEIPT=No resumed receipt assigned to this.
+BARCODE_HEADER=Barcode number:
+QRCODE_HEADER=QR code:

diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index c0ece92c86b92bbaacf10f3d6388626c5df417a1..359ae1f46e68f6cf22d8bc09a2b3acd232bcfebb 100644 (file)
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -460,7 +460,7 @@
                                                <p:outputLabel value="#{project.RECEIPT_REGISTER_NUMBER_HEADER}" title="#{project.RECEIPT_REGISTER_NUMBER_TITLE}" />
                                                <h:outputText value="#{receiptListController.selectedReceipt.receiptRegisterNumber}" />
 
-                                               <p:outputLabel value="#{project.BARCODE_NUMBER_HEADER}" title="#{project.RECEIPT_BARCODE_TITLE}" />
+                                               <p:outputLabel value="#{project.BARCODE_HEADER}" title="#{project.RECEIPT_BARCODE_TITLE}" />
                                                <h:outputText value="#{project.RECEIPT_NO_BARCODE_ASSIGNED}" rendered="#{empty receiptListController.selectedReceipt.receiptBarCodeNumber}" />
                                                <p:barcode
                                                        format="svg"

diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml
index 52e639f0552616094b695be1284f6bb00a19aaa4..0a50a1931ce667201b650efe1c233c352245bfb1 100644 (file)
--- a/web/admin/generic_product/admin_generic_product_list.xhtml
+++ b/web/admin/generic_product/admin_generic_product_list.xhtml
@@ -332,9 +332,15 @@
                                                <h:outputText value="#{productListController.selectedProduct.productNumber}" rendered="#{not empty productListController.selectedProduct.productNumber}" />
                                                <h:outputText value="#{product.ADMIN_NO_PRODUCT_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productNumber}" />
 
-                                               <p:outputLabel value="#{product.BARCODE_NUMBER_HEADER}" title="#{product.PRODUCT_BARCODE_NUMBER_TITLE}" />
+                                               <p:outputLabel value="#{project.BARCODE_HEADER}" title="#{product.PRODUCT_BARCODE_NUMBER_TITLE}" />
                                                <h:outputText value="#{product.PRODUCT_NO_BARCODE_NUMBER_ASSIGNED}" rendered="#{empty productListController.selectedProduct.productBarCodeNumber}" />
-                                               <p:barcode format="svg" width="100%" type="#{initParam['product_barcode_type']}" value="#{productListController.selectedProduct.productBarCodeNumber}" rendered="#{not empty productListController.selectedProduct.productBarCodeNumber}" />
+                                               <p:barcode
+                                                       format="svg"
+                                                       width="100%"
+                                                       type="#{initParam['product_barcode_type']}"
+                                                       value="#{productListController.selectedProduct.productBarCodeNumber}"
+                                                       rendered="#{not empty productListController.selectedProduct.productBarCodeNumber}"
+                                                       />
 
                                                <p:outputLabel value="#{product.ADMIN_PRODUCT_FSC_NUMBER_HEADER}" title="#{product.PRODUCT_FSC_NUMBER_TITLE}" />
                                                <h:outputText value="#{productListController.selectedProduct.productFscNumber}" rendered="#{not empty productListController.selectedProduct.productFscNumber}" />