Merge pull request #2091 from dpfaffenbauer/issues/translations

[Translations] fix order object translations
coreshop · Oct 4, 2022 · c1f72a6 · c1f72a6
2 parents c02916f + 65d381b
commit c1f72a6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/...undle/CoreBundle/Resources/install/pimcore/classes/CoreShopOrderBundle/CoreShopOrder.json b/...undle/CoreBundle/Resources/install/pimcore/classes/CoreShopOrderBundle/CoreShopOrder.json
@@ -3342,7 +3342,7 @@
                                 "name": "numbers_store",
                                 "type": null,
                                 "region": null,
-                                "title": "coreshop.order.numbers_store",
+                                "title": "coreshop.order.numbers",
                                 "width": null,
                                 "height": null,
                                 "collapsible": false,
@@ -3738,7 +3738,7 @@
                                         "phpdocType": "string",
                                         "dynamicOptions": false,
                                         "name": "currency",
-                                        "title": "coreshop.order.currency",
+                                        "title": "coreshop.order.converted_currency",
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": true,
@@ -4083,7 +4083,7 @@
                                                 "title": "coreshop.order.weight",
                                                 "tooltip": "",
                                                 "mandatory": false,
-                                                "noteditable": false,
+                                                "noteditable": true,
                                                 "index": false,
                                                 "locked": false,
                                                 "style": "",

diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/install/pimcore/classes/CoreShopOrder.json b/src/CoreShop/Bundle/OrderBundle/Resources/install/pimcore/classes/CoreShopOrder.json
@@ -3271,7 +3271,7 @@
                                 "name": "numbers_store",
                                 "type": null,
                                 "region": null,
-                                "title": "coreshop.order.numbers_store",
+                                "title": "coreshop.order.numbers",
                                 "width": null,
                                 "height": null,
                                 "collapsible": false,
@@ -3620,7 +3620,7 @@
                                         "phpdocType": "string",
                                         "dynamicOptions": false,
                                         "name": "currency",
-                                        "title": "coreshop.order.currency",
+                                        "title": "coreshop.order.converted_currency",
                                         "tooltip": "",
                                         "mandatory": false,
                                         "noteditable": true,

diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/translations/admin.de.yml b/src/CoreShop/Bundle/OrderBundle/Resources/translations/admin.de.yml
@@ -362,12 +362,13 @@ coreshop.order.payment_provider: 'Zahlungsanbieter'
 coreshop.order.additional_data: 'Zusätzliche Daten'
 coreshop.order.status: 'Status'
 coreshop.order.order_state: 'Bestellstatus'
+coreshop.order.quote_state: 'Angebotstatus'
 coreshop.order.payment_state: 'Zahlungstatus'
 coreshop.order.shipping_state: 'Versandstatus'
 coreshop.order.invoice_state: 'Rechnungstatus'
 coreshop.order.numbers: 'Zahlen'
 coreshop.order.numbers_converted: 'Zahlen (Umgerechnet)'
-coreshop.order.currency: 'Währung'
+coreshop.order.currency_converted: 'Umgerechnte Währung'
 coreshop.order.totals: 'Summen'
 coreshop.order.total_net: 'Summe (Netto)'
 coreshop.order.total_gross: 'Summe (Brutto)'
@@ -377,7 +378,7 @@ coreshop.order.taxes: 'Steuern'
 coreshop.order.adjustments: 'Adaptierungen'
 coreshop.order.adjustments_total_gross: 'Adaptierungen Summe (Brutto)'
 coreshop.order.adjustments_total_net: 'Adaptierungen Summe (Netto)'
-coreshop.order.base_currency: 'Umgerechnet Währung'
+coreshop.order.base_currency: 'Basis Währung'
 coreshop.order.converted_totals: 'Umgerechnet Summen'
 coreshop.order.converted_total_net: 'Umgerechnet Summe (Netto)'
 coreshop.order.converted_total_gross: 'Umgerechnet Summe (Brutto)'
@@ -466,3 +467,5 @@ coreshop.order_item.custom_item_price: 'kundenspezifischer Positionspreis'
 coreshop.order_item.converted_custom_item_price: 'Umgerechnet kundenspezifischer Positionspreis'
 coreshop.order.converted_payment_total: 'Umgerechnet Zahlungsbetrag'
 coreshop.order.payment_total: 'Zahlungsbetrag'
+coreshop.order.carrier: 'Versanddienst'
+coreshop.order.weight: 'Gewicht'
diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/translations/admin.en.yml b/src/CoreShop/Bundle/OrderBundle/Resources/translations/admin.en.yml
@@ -364,12 +364,13 @@ coreshop.order.payment_provider: 'Payment Provider'
 coreshop.order.additional_data: 'Additional Data'
 coreshop.order.status: 'State'
 coreshop.order.order_state: 'Order State'
+coreshop.order.quote_state: 'Quote State'
 coreshop.order.payment_state: 'Payment State'
 coreshop.order.shipping_state: 'Shipping State'
 coreshop.order.invoice_state: 'Invoice State'
 coreshop.order.numbers: 'Numbers'
 coreshop.order.numbers_converted: 'Numbers (Converted)'
-coreshop.order.currency: 'Currency'
+coreshop.order.converted_currency: 'Converted Currency'
 coreshop.order.totals: 'Totals'
 coreshop.order.total_net: 'Total (Net)'
 coreshop.order.total_gross: 'Total (Gross)'
@@ -379,7 +380,7 @@ coreshop.order.taxes: 'Taxes'
 coreshop.order.adjustments: 'Adjustments'
 coreshop.order.adjustments_total_gross: 'Adjustments Total (Gross)'
 coreshop.order.adjustments_total_net: 'Adjustments Total (Net)'
-coreshop.order.base_currency: 'Converted Currency'
+coreshop.order.base_currency: 'Base Currency'
 coreshop.order.converted_totals: 'Converted Totals'
 coreshop.order.converted_total_net: 'Converted Total (Net)'
 coreshop.order.converted_total_gross: 'Converted Total (Gross)'
@@ -468,3 +469,5 @@ coreshop.order_item.custom_item_price: 'Custom Item Price'
 coreshop.order_item.converted_custom_item_price: 'Converted Custom Item Price'
 coreshop.order.converted_payment_total: 'Converted Payment Total'
 coreshop.order.payment_total: 'Payment Total'
+coreshop.order.carrier: 'Carrier'
+coreshop.order.weight: 'Weight'