From 7cdb120d38946e5950acb35dab371c86a813e8e5 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Thu, 13 Aug 2020 13:28:29 +0200 Subject: [PATCH] Update messages and changelog --- CHANGELOG.md | 1 + locale/defaultMessages.json | 123 ++++++++++-------- .../ProductExportDialog/messages.ts | 58 ++++----- 3 files changed, 97 insertions(+), 85 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bc0e0188..9b91d6ac5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ All notable, unreleased changes to this project will be documented in this file. - Do not use devserver to run cypress tests - #650 by @dominik-zeglen - Fix updating product that has no variants - #649 by @dominik-zeglen - Update checkbox design - #651 by @dominik-zeglen +- Add warehouse choice - #646 by @dominik-zeglen ## 2.10.1 diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index 7a0da553b..f5faf5e7b 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -205,6 +205,62 @@ "context": "vat not included in order price", "string": "does not apply" }, + "productExportFieldCategory": { + "context": "product field", + "string": "Category" + }, + "productExportFieldCollections": { + "context": "product field", + "string": "Collections" + }, + "productExportFieldDescription": { + "context": "product field", + "string": "Description" + }, + "productExportFieldName": { + "context": "product field", + "string": "Name" + }, + "productExportFieldPrice": { + "context": "product field", + "string": "Cost Price" + }, + "productExportFieldProductImages": { + "context": "product field", + "string": "Product Images" + }, + "productExportFieldProductWeight": { + "context": "product field", + "string": "Export Product Weight" + }, + "productExportFieldTaxes": { + "context": "product field", + "string": "Charge Taxes" + }, + "productExportFieldType": { + "context": "product field", + "string": "Type" + }, + "productExportFieldVariantImages": { + "context": "product field", + "string": "Variant Images" + }, + "productExportFieldVariantPrice": { + "context": "product field", + "string": "Variant Price" + }, + "productExportFieldVariantSku": { + "context": "product field", + "string": "Export Variant SKU" + }, + "productExportFieldVariantWeight": { + "context": "product field", + "string": "Export Variant Weight" + }, + "productExportFieldVisibility": { + "context": "product field", + "string": "Visibility" + }, "productStatusLabel": { "context": "product", "string": "Published" @@ -3928,34 +3984,22 @@ "context": "product name", "string": "Name" }, + "src_dot_products_dot_components_dot_ProductExportDialog_dot_1004476569": { + "context": "option", + "string": "Export stock for all warehouses" + }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_108342258": { "context": "button", "string": "Load More" }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_1459686496": { - "context": "product field", - "string": "Visibility" - }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_1547327218": { "context": "there are more elements of list that are hidden", "string": "and {number} more" }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_1755013298": { - "context": "product field", - "string": "Category" - }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_1890035856": { "context": "informations about product organization, header", "string": "Product Organization" }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_1952810469": { - "context": "product field", - "string": "Type" - }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_2051669917": { - "context": "product field", - "string": "Cost Price" - }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_2119710854": { "context": "informations about product seo, header", "string": "SEO Information" @@ -3964,10 +4008,6 @@ "context": "export selected products to csv file", "string": "Selected products ({number})" }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_222873645": { - "context": "product field", - "string": "Collections" - }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_2318723509": { "context": "export products to csv file, choice field label", "string": "Export information for:" @@ -3976,6 +4016,10 @@ "context": "export all products to csv file", "string": "All products ({number})" }, + "src_dot_products_dot_components_dot_ProductExportDialog_dot_2474350154": { + "context": "list of warehouses", + "string": "Warehouses A to Z" + }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_2659464408": { "context": "product export to csv file, header", "string": "Information exported" @@ -3988,10 +4032,6 @@ "context": "export products to csv file, button", "string": "export products" }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_2949617129": { - "context": "product field", - "string": "Product Images" - }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_3012202273": { "context": "export products to csv file, dialog header", "string": "Export Information" @@ -4000,14 +4040,6 @@ "context": "product export to csv file, header", "string": "Export Settings" }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_3374163063": { - "context": "product field", - "string": "Description" - }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_3441755345": { - "context": "product field", - "string": "Charge Taxes" - }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_3443345452": { "context": "selectt all options", "string": "Select All" @@ -4016,13 +4048,12 @@ "context": "export products as spreadsheet", "string": "Spreadsheet for Excel, Numbers etc." }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_3544554440": { - "context": "product field", - "string": "Variant Weight" - }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_3599582104": { "string": "Search Atrtibuttes" }, + "src_dot_products_dot_components_dot_ProductExportDialog_dot_3902059658": { + "string": "Export Product Stock Quantity to CSV" + }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_3919525499": { "context": "informations about product stock, header", "string": "Inventory Information" @@ -4031,10 +4062,6 @@ "context": "export products as csv file", "string": "Plain CSV file" }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_4160582036": { - "context": "product field", - "string": "Variant Price" - }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_472026385": { "context": "select product informations to be exported", "string": "Information exported:" @@ -4043,14 +4070,6 @@ "context": "input helper text, search attributes", "string": "Search by attribute name" }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_636461959": { - "context": "product field", - "string": "Name" - }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_693960049": { - "context": "product field", - "string": "SKU" - }, "src_dot_products_dot_components_dot_ProductExportDialog_dot_700651641": { "context": "export filtered products to csv file", "string": "Current search ({number})" @@ -4059,14 +4078,6 @@ "context": "informations about product prices etc, header", "string": "Financial Information" }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_746695941": { - "context": "product field", - "string": "Weight" - }, - "src_dot_products_dot_components_dot_ProductExportDialog_dot_897437458": { - "context": "product field", - "string": "Variant Images" - }, "src_dot_products_dot_components_dot_ProductImageNavigation_dot_3060635772": { "context": "section header", "string": "All Photos" diff --git a/src/products/components/ProductExportDialog/messages.ts b/src/products/components/ProductExportDialog/messages.ts index 38adaf37c..edeaec664 100644 --- a/src/products/components/ProductExportDialog/messages.ts +++ b/src/products/components/ProductExportDialog/messages.ts @@ -5,79 +5,79 @@ function useProductExportFieldMessages() { const intl = useIntl(); const messages = { - [ProductFieldEnum.CATEGORY]: { + [ProductFieldEnum.CATEGORY]: intl.formatMessage({ defaultMessage: "Category", description: "product field", id: "productExportFieldCategory" - }, - [ProductFieldEnum.CHARGE_TAXES]: { + }), + [ProductFieldEnum.CHARGE_TAXES]: intl.formatMessage({ defaultMessage: "Charge Taxes", description: "product field", id: "productExportFieldTaxes" - }, - [ProductFieldEnum.COLLECTIONS]: { + }), + [ProductFieldEnum.COLLECTIONS]: intl.formatMessage({ defaultMessage: "Collections", description: "product field", id: "productExportFieldCollections" - }, - [ProductFieldEnum.COST_PRICE]: { + }), + [ProductFieldEnum.COST_PRICE]: intl.formatMessage({ defaultMessage: "Cost Price", description: "product field", id: "productExportFieldPrice" - }, - [ProductFieldEnum.DESCRIPTION]: { + }), + [ProductFieldEnum.DESCRIPTION]: intl.formatMessage({ defaultMessage: "Description", description: "product field", id: "productExportFieldDescription" - }, - [ProductFieldEnum.NAME]: { + }), + [ProductFieldEnum.NAME]: intl.formatMessage({ defaultMessage: "Name", description: "product field", id: "productExportFieldName" - }, - [ProductFieldEnum.PRODUCT_IMAGES]: { + }), + [ProductFieldEnum.PRODUCT_IMAGES]: intl.formatMessage({ defaultMessage: "Product Images", description: "product field", id: "productExportFieldProductImages" - }, - [ProductFieldEnum.PRODUCT_TYPE]: { + }), + [ProductFieldEnum.PRODUCT_TYPE]: intl.formatMessage({ defaultMessage: "Type", description: "product field", id: "productExportFieldType" - }, - [ProductFieldEnum.PRODUCT_WEIGHT]: { + }), + [ProductFieldEnum.PRODUCT_WEIGHT]: intl.formatMessage({ defaultMessage: "Export Product Weight", description: "product field", id: "productExportFieldProductWeight" - }, - [ProductFieldEnum.VARIANT_IMAGES]: { + }), + [ProductFieldEnum.VARIANT_IMAGES]: intl.formatMessage({ defaultMessage: "Variant Images", description: "product field", id: "productExportFieldVariantImages" - }, - [ProductFieldEnum.VARIANT_PRICE]: { + }), + [ProductFieldEnum.VARIANT_PRICE]: intl.formatMessage({ defaultMessage: "Variant Price", description: "product field", id: "productExportFieldVariantPrice" - }, - [ProductFieldEnum.VARIANT_SKU]: { + }), + [ProductFieldEnum.VARIANT_SKU]: intl.formatMessage({ defaultMessage: "Export Variant SKU", description: "product field", id: "productExportFieldVariantSku" - }, - [ProductFieldEnum.VARIANT_WEIGHT]: { + }), + [ProductFieldEnum.VARIANT_WEIGHT]: intl.formatMessage({ defaultMessage: "Export Variant Weight", description: "product field", id: "productExportFieldVariantWeight" - }, - [ProductFieldEnum.VISIBLE]: { + }), + [ProductFieldEnum.VISIBLE]: intl.formatMessage({ defaultMessage: "Visibility", description: "product field", id: "productExportFieldVisibility" - } + }) }; - return (field: ProductFieldEnum) => intl.formatMessage(messages[field]); + return (field: ProductFieldEnum) => messages[field]; } export default useProductExportFieldMessages;