Don't cherry-pick:

- added missing i18n strings

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

diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index 14f4e099aeed642e4236f960a812aaf157e25f6c..b1c9e59a5bdd826f501cd0161eb5a9c192a9f236 100644 (file)
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -54,6 +54,7 @@ ENTERED_RECEIPT_NUMBER_INVALID=Die eingegebene Bonnummer/Rechnungsnummer ist kle
 ADMIN_SELECT_RECEIPT_USER_OWNER=Kassenbon einem Benutzer zuweisen:
 ENTER_RECEIPT_REGISTER_NUMBER=Kassennummer eingeben:
 ENTER_RECEIPT_BARCODE_NUMBER=Barcode-Nummer eingeben:
+SCAN_RECEIPT_QR_CODE=QR-Code scannen:
 ADMIN_RECEIPT_OTHER_LEGEND=Sonstige Daten des Kassenbons eingeben:
 ADMIN_RECEIPT_OTHER_LEGEND_TITLE=Geben Sie hier weitere Daten an, die Sie auf dem Kassenbon finden koennen.
 ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE=Zeigt zugewiesenen Benutzer des Kassenbons an.
@@ -127,6 +128,7 @@ ASSIGNED_RECEIPT_USER_TITLE=Zugewiesener Benutzer zum Kassenbon.
 NO_USER_ASSIGNED_TO_RECEIPT=Kein Benutzer dem Kassenbon zugewiesen.
 RECEIPT_ID_NUMBER_TITLE=Id-Nummer des Kassenbonus.
 RECEIPT_BARCODE_TITLE=Streifencode des Kassenbons.
+RECEIPT_QRCODE_TITLE=QR-Code des Kassenbons.
 RECEIPT_SEQUENCE_NUMBER_HEADER=Durchlaufende Nummer:
 RECEIPT_SEQUENCE_NUMBER_TITLE=Durchlaufende Nummer des Kassenbons.
 RECEIPT_PAYMENT_TYPE_TITLE=Bezahlungsart des Kassenbons.
@@ -155,6 +157,7 @@ ENTER_RECEIPT_TRANSACTION_NUMBER=Transaktionsnummer eingeben:
 RECEIPT_REGISTER_NUMBER_HEADER=Kassennummer:
 RECEIPT_REGISTER_NUMBER_TITLE=Kassenummer des Kassenbons.
 RECEIPT_NO_BARCODE_ASSIGNED=Dem Kassenbon wurde kein Barcode zugewiesen.
+RECEIPT_NO_QRCODE_ASSIGNED=Dem Kassenbon wurde kein QR-Code zugewiesen.
 RECEIPT_NUMBER=Kassenbonnummer
 ENTER_RECEIPT_ITEM_BRAND_NAME=Warenzeichen/Marke eingeben:
 ENTER_RECEIPT_ITEM_BRAND_NAME_TITLE=Geben Sie das Warenzeichen ein, dass Sie auf dem Kassenbon finden.

diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties
index 4da938528d13d396f7f599df4a82d9777bd6feb8..9e2ad4a96c17bbd5521dab017dc4bdc14f0e1ebb 100644 (file)
--- a/src/java/org/mxchange/localization/project_en_US.properties
+++ b/src/java/org/mxchange/localization/project_en_US.properties
@@ -46,6 +46,7 @@ ENTERED_RECEIPT_NUMBER_INVALID=Your entered receipt number is smaller than 1 or
 ADMIN_SELECT_RECEIPT_USER_OWNER=Assign receipt to user:
 ENTER_RECEIPT_REGISTER_NUMBER=Enter cash register number:
 ENTER_RECEIPT_BARCODE_NUMBER=Enter bar code number:
+SCAN_RECEIPT_QRCODE=Scan QR code:
 ADMIN_RECEIPT_OTHER_LEGEND=Enter other data of receipt:
 ADMIN_RECEIPT_OTHER_LEGEND_TITLE=Enter other additional data you can find on the receipt.
 ADMIN_LINK_SHOW_RECEIPT_OWNER_USER_TITLE=Shows assigned user of receipt.
@@ -103,6 +104,7 @@ ASSIGNED_RECEIPT_USER_TITLE=Assigned user of receipt.
 NO_USER_ASSIGNED_TO_RECEIPT=No user assigned to receipt.
 RECEIPT_ID_NUMBER_TITLE=Id number of receipt.
 RECEIPT_BARCODE_TITLE=Barcode of receipt.
+RECEIPT_QRCODE_TITLE=QR code of receipt.
 RECEIPT_SEQUENCE_NUMBER_HEADER=Sequence number:
 RECEIPT_SEQUENCE_NUMBER_TITLE=Sequence number of receipt.
 RECEIPT_PAYMENT_TYPE_TITLE=Payment type of receipt.
@@ -131,6 +133,7 @@ ENTER_RECEIPT_TRANSACTION_NUMBER=Enter transaction Number:
 RECEIPT_REGISTER_NUMBER_HEADER=Register number:
 RECEIPT_REGISTER_NUMBER_TITLE=Register's number of receipt.
 RECEIPT_NO_BARCODE_ASSIGNED=No barcode has been assigned to the receipt.
+RECEIPT_NO_QRCODE_ASSIGNED=No QR code has been assigned to the receipt.
 RECEIPT_NUMBER=Receipt number
 ENTER_RECEIPT_ITEM_BRAND_NAME=Enter item's brand name:
 ENTER_RECEIPT_ITEM_BRAND_NAME_TITLE=Enter the item's brand name found on receipt.

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 7c5bdd7276e37cce34cc3e358237a5f900596185..d1968fda8303fdedb84843c3fd5cde0cde867da1 100644 (file)
--- 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
@@ -172,7 +172,7 @@
                        <p:outputLabel for="receiptBarCodeNumber" value="#{project.ENTER_RECEIPT_BARCODE_NUMBER}" />
                        <p:inputText id="receiptBarCodeNumber" size="20" maxlength="255" value="#{adminReceiptActionController.receiptBarCodeNumber}" />
 
-                       <p:outputLabel for="receiptQrCode" value="#{project.ENTER_RECEIPT_QRCODE}" />
+                       <p:outputLabel for="receiptQrCode" value="#{project.SCAN_RECEIPT_QRCODE}" />
                        <p:inputTextarea id="receiptQrCode" rows="5" value="#{adminReceiptActionController.receiptQrCode}" />
 
                        <p:outputLabel for="receiptSequenceNumber" value="#{project.ENTER_RECEIPT_SEQUENCE_NUMBER}" />

diff --git a/web/admin/financial/receipt/admin_receipt_list.xhtml b/web/admin/financial/receipt/admin_receipt_list.xhtml
index 86dcc14709e3ee7888f5d83c372d0faefca17bd4..87017cf3aba5665e20bb8b7dbfa9495b60f5925e 100644 (file)
--- a/web/admin/financial/receipt/admin_receipt_list.xhtml
+++ b/web/admin/financial/receipt/admin_receipt_list.xhtml
@@ -471,7 +471,7 @@
                                                        />
 
                                                <p:outputLabel value="#{project.QRCODE_HEADER}" title="#{project.RECEIPT_QRCODE_TITLE}" />
-                                               <h:outputText value="#{project.RECEIPT_NO_BARCODE_ASSIGNED}" rendered="#{empty receiptListController.selectedReceipt.receiptQrCode}" />
+                                               <h:outputText value="#{project.RECEIPT_NO_QRCODE_ASSIGNED}" rendered="#{empty receiptListController.selectedReceipt.receiptQrCode}" />
                                                <p:barcode
                                                        format="svg"
                                                        width="100%"