From 88819f006724d508c322a931113c76fda3c51942 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Tue, 26 Nov 2019 15:34:56 +0100 Subject: [PATCH] Improve copy --- locale/messages.pot | 170 +++++++++--------- src/components/Navigator/NavigatorInput.tsx | 21 ++- .../Navigator/modes/commands/actions.ts | 10 +- src/components/Navigator/modes/messages.ts | 49 +++-- .../CustomerCreatePage/CustomerCreatePage.tsx | 2 +- .../CustomerListPage/CustomerListPage.tsx | 2 +- .../__snapshots__/Stories.test.ts.snap | 12 +- 7 files changed, 142 insertions(+), 124 deletions(-) diff --git a/locale/messages.pot b/locale/messages.pot index 89e81a233..28902c762 100644 --- a/locale/messages.pot +++ b/locale/messages.pot @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2019-11-26T14:15:31.985Z\n" +"POT-Creation-Date: 2019-11-26T14:34:48.426Z\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "MIME-Version: 1.0\n" @@ -159,14 +159,6 @@ msgctxt "dialog title" msgid "Add Address" msgstr "" -#: build/locale/src/components/Navigator/modes/messages.json -#. [src.components.Navigator.modes.addCategory] - button -#. defaultMessage is: -#. Add Category -msgctxt "button" -msgid "Add Category" -msgstr "" - #: build/locale/src/collections/components/CollectionCreatePage/CollectionCreatePage.json #. [src.collections.components.CollectionCreatePage.951411809] - page header #. defaultMessage is: @@ -175,30 +167,6 @@ msgctxt "page header" msgid "Add Collection" msgstr "" -#: build/locale/src/components/Navigator/modes/messages.json -#. [src.components.Navigator.modes.addCollection] - button -#. defaultMessage is: -#. Add Collection -msgctxt "button" -msgid "Add Collection" -msgstr "" - -#: build/locale/src/components/Navigator/modes/messages.json -#. [src.components.Navigator.modes.addCustomer] - button -#. defaultMessage is: -#. Add Customer -msgctxt "button" -msgid "Add Customer" -msgstr "" - -#: build/locale/src/customers/components/CustomerCreatePage/CustomerCreatePage.json -#. [src.customers.components.CustomerCreatePage.2622255457] - page header -#. defaultMessage is: -#. Add Customer -msgctxt "page header" -msgid "Add Customer" -msgstr "" - #: build/locale/src/components/Filter/Filter.json #. [src.components.Filter.2852521946] - button #. defaultMessage is: @@ -239,14 +207,6 @@ msgctxt "dialog header" msgid "Add Price Rate" msgstr "" -#: build/locale/src/components/Navigator/modes/messages.json -#. [src.components.Navigator.modes.addProduct] - button -#. defaultMessage is: -#. Add Product -msgctxt "button" -msgid "Add Product" -msgstr "" - #: build/locale/src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.json #. [src.orders.components.OrderFulfillmentTrackingDialog.606831229] - dialog header #. defaultMessage is: @@ -271,14 +231,6 @@ msgctxt "header" msgid "Add Value to Authorization Field" msgstr "" -#: build/locale/src/components/Navigator/modes/messages.json -#. [src.components.Navigator.modes.addVoucher] - button -#. defaultMessage is: -#. Add Voucher -msgctxt "button" -msgid "Add Voucher" -msgstr "" - #: build/locale/src/shipping/components/ShippingZoneRateDialog/ShippingZoneRateDialog.json #. [src.shipping.components.ShippingZoneRateDialog.1397795758] - add weight based shipping method, dialog header #. defaultMessage is: @@ -303,14 +255,6 @@ msgctxt "button" msgid "Add authentication" msgstr "" -#: build/locale/src/customers/components/CustomerListPage/CustomerListPage.json -#. [src.customers.components.CustomerListPage.1934221653] - button -#. defaultMessage is: -#. Add customer -msgctxt "button" -msgid "Add customer" -msgstr "" - #: build/locale/src/components/Filter/FilterContent.json #. [src.components.Filter.2851720415] - button #. defaultMessage is: @@ -1840,13 +1784,9 @@ msgid "Categories ({quantity})" msgstr "" #: build/locale/src/components/Navigator/modes/messages.json -#. [src.components.Navigator.modes.category] - catalog item type +#. [src.components.Navigator.modes.category] #. defaultMessage is: #. Category -msgctxt "catalog item type" -msgid "Category" -msgstr "" - #: build/locale/src/products/components/ProductCategoryAndCollectionsForm/ProductCategoryAndCollectionsForm.json #. [src.products.components.ProductCategoryAndCollectionsForm.1755013298] #. defaultMessage is: @@ -2012,10 +1952,10 @@ msgid "Code" msgstr "" #: build/locale/src/components/Navigator/modes/messages.json -#. [src.components.Navigator.modes.collection] - catalog item type +#. [src.components.Navigator.modes.collection] #. defaultMessage is: #. Collection -msgctxt "catalog item type" +msgctxt "description" msgid "Collection" msgstr "" @@ -2399,6 +2339,38 @@ msgctxt "create service token, button" msgid "Create" msgstr "" +#: build/locale/src/components/Navigator/modes/messages.json +#. [src.components.Navigator.modes.createCategory] - button +#. defaultMessage is: +#. Create Category +msgctxt "button" +msgid "Create Category" +msgstr "" + +#: build/locale/src/components/Navigator/modes/messages.json +#. [src.components.Navigator.modes.createCollection] - button +#. defaultMessage is: +#. Create Collection +msgctxt "button" +msgid "Create Collection" +msgstr "" + +#: build/locale/src/components/Navigator/modes/messages.json +#. [src.components.Navigator.modes.createCustomer] - button +#. defaultMessage is: +#. Create Customer +msgctxt "button" +msgid "Create Customer" +msgstr "" + +#: build/locale/src/customers/components/CustomerCreatePage/CustomerCreatePage.json +#. [src.customers.components.CustomerCreatePage.4025686004] - page header +#. defaultMessage is: +#. Create Customer +msgctxt "page header" +msgid "Create Customer" +msgstr "" + #: build/locale/src/navigation/components/MenuCreateDialog/MenuCreateDialog.json #. [menuCreateDialogHeader] - dialog header #. defaultMessage is: @@ -2471,14 +2443,10 @@ msgctxt "header" msgid "Create Page" msgstr "" -#: build/locale/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.json -#. [src.orders.components.OrderProductAddDialog.1542417144] - dialog header +#: build/locale/src/components/Navigator/modes/messages.json +#. [src.components.Navigator.modes.createProduct] - button #. defaultMessage is: #. Create Product -msgctxt "dialog header" -msgid "Create Product" -msgstr "" - #: build/locale/src/products/components/ProductListPage/ProductListPage.json #. [src.products.components.ProductListPage.1542417144] - button #. defaultMessage is: @@ -2487,6 +2455,14 @@ msgctxt "button" msgid "Create Product" msgstr "" +#: build/locale/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.json +#. [src.orders.components.OrderProductAddDialog.1542417144] - dialog header +#. defaultMessage is: +#. Create Product +msgctxt "dialog header" +msgid "Create Product" +msgstr "" + #: build/locale/src/products/views/ProductCreate.json #. [src.products.views.1542417144] - window title #. defaultMessage is: @@ -2559,6 +2535,14 @@ msgctxt "header" msgid "Create Variant" msgstr "" +#: build/locale/src/components/Navigator/modes/messages.json +#. [src.components.Navigator.modes.createVoucher] - button +#. defaultMessage is: +#. Create Voucher +msgctxt "button" +msgid "Create Voucher" +msgstr "" + #: build/locale/src/discounts/components/VoucherCreatePage/VoucherCreatePage.json #. [src.discounts.components.VoucherCreatePage.1357216572] - page header #. defaultMessage is: @@ -2631,6 +2615,14 @@ msgctxt "window title" msgid "Create collection" msgstr "" +#: build/locale/src/customers/components/CustomerListPage/CustomerListPage.json +#. [src.customers.components.CustomerListPage.2859116187] - button +#. defaultMessage is: +#. Create customer +msgctxt "button" +msgid "Create customer" +msgstr "" + #: build/locale/src/customers/views/CustomerCreate.json #. [src.customers.views.2859116187] - window title #. defaultMessage is: @@ -6376,13 +6368,9 @@ msgid "Primary Address" msgstr "" #: build/locale/src/components/Navigator/modes/messages.json -#. [src.components.Navigator.modes.product] - catalog item type +#. [src.components.Navigator.modes.product] #. defaultMessage is: #. Product -msgctxt "catalog item type" -msgid "Product" -msgstr "" - #: build/locale/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.json #. [src.orders.components.OrderDraftDetailsProducts.1895667608] #. defaultMessage is: @@ -7207,6 +7195,14 @@ msgctxt "description" msgid "Search Countries" msgstr "" +#: build/locale/src/components/Navigator/NavigatorInput.json +#. [src.components.Navigator.1643417013] - navigator placeholder +#. defaultMessage is: +#. Search Customer +msgctxt "navigator placeholder" +msgid "Search Customer" +msgstr "" + #: build/locale/src/customers/components/CustomerListPage/CustomerListPage.json #. [src.customers.components.CustomerListPage.1643417013] #. defaultMessage is: @@ -7515,6 +7511,14 @@ msgctxt "navigator section header" msgid "Search in Catalog" msgstr "" +#: build/locale/src/components/Navigator/NavigatorInput.json +#. [src.components.Navigator.2935523260] - navigator placeholder +#. defaultMessage is: +#. Search in Catalog +msgctxt "navigator placeholder" +msgid "Search in Catalog" +msgstr "" + #: build/locale/src/components/Navigator/Navigator.json #. [src.components.Navigator.1809988825] - navigator section header #. defaultMessage is: @@ -8823,6 +8827,14 @@ msgctxt "product type name" msgid "Type Name" msgstr "" +#: build/locale/src/components/Navigator/NavigatorInput.json +#. [src.components.Navigator.2874620973] - navigator placeholder +#. defaultMessage is: +#. Type {key} to see available actions +msgctxt "navigator placeholder" +msgid "Type {key} to see available actions" +msgstr "" + #: build/locale/src/pages/components/PageSlug/PageSlug.json #. [src.pages.components.PageSlug.1324178587] #. defaultMessage is: @@ -9139,14 +9151,6 @@ msgctxt "voucher value requirement" msgid "Usage Limit" msgstr "" -#: build/locale/src/components/Navigator/NavigatorInput.json -#. [src.components.Navigator.3921504214] - navigator placeholder -#. defaultMessage is: -#. Use Navigator to move through Saleor -msgctxt "navigator placeholder" -msgid "Use Navigator to move through Saleor" -msgstr "" - #: build/locale/src/attributes/components/AttributeProperties/AttributeProperties.json #. [src.attributes.components.AttributeProperties.1318123158] - attribute is filterable in storefront #. defaultMessage is: diff --git a/src/components/Navigator/NavigatorInput.tsx b/src/components/Navigator/NavigatorInput.tsx index cfc0619cd..b82235162 100644 --- a/src/components/Navigator/NavigatorInput.tsx +++ b/src/components/Navigator/NavigatorInput.tsx @@ -78,10 +78,27 @@ const NavigatorInput = React.forwardRef( defaultMessage: "Type Command", description: "navigator placeholder" }) - : intl.formatMessage({ - defaultMessage: "Use Navigator to move through Saleor", + : mode === "catalog" + ? intl.formatMessage({ + defaultMessage: "Search in Catalog", description: "navigator placeholder" }) + : mode === "customers" + ? intl.formatMessage({ + defaultMessage: "Search Customer", + description: "navigator placeholder" + }) + : mode === "default" + ? intl.formatMessage( + { + defaultMessage: "Type {key} to see available actions", + description: "navigator placeholder" + }, + { + key: "'?'" + } + ) + : null } ref={ref} {...rest} diff --git a/src/components/Navigator/modes/commands/actions.ts b/src/components/Navigator/modes/commands/actions.ts index 66aa226ee..07fad303f 100644 --- a/src/components/Navigator/modes/commands/actions.ts +++ b/src/components/Navigator/modes/commands/actions.ts @@ -29,35 +29,35 @@ export function searchInCommands( ): QuickSearchActionInput[] { const actions: Command[] = [ { - label: intl.formatMessage(messages.addCategory), + label: intl.formatMessage(messages.createCategory), onClick: () => { navigate(categoryAddUrl()); return false; } }, { - label: intl.formatMessage(messages.addCollection), + label: intl.formatMessage(messages.createCollection), onClick: () => { navigate(collectionAddUrl); return false; } }, { - label: intl.formatMessage(messages.addProduct), + label: intl.formatMessage(messages.createProduct), onClick: () => { navigate(productAddUrl); return false; } }, { - label: intl.formatMessage(messages.addCustomer), + label: intl.formatMessage(messages.createCustomer), onClick: () => { navigate(customerAddUrl); return false; } }, { - label: intl.formatMessage(messages.addVoucher), + label: intl.formatMessage(messages.createVoucher), onClick: () => { navigate(voucherAddUrl); return false; diff --git a/src/components/Navigator/modes/messages.ts b/src/components/Navigator/modes/messages.ts index d17174278..6d3fef9d3 100644 --- a/src/components/Navigator/modes/messages.ts +++ b/src/components/Navigator/modes/messages.ts @@ -1,33 +1,11 @@ import { defineMessages } from "react-intl"; const messages = defineMessages({ - addCategory: { - defaultMessage: "Add Category", - description: "button" - }, - addCollection: { - defaultMessage: "Add Collection", - description: "button" - }, - addCustomer: { - defaultMessage: "Add Customer", - description: "button" - }, - addProduct: { - defaultMessage: "Add Product", - description: "button" - }, - addVoucher: { - defaultMessage: "Add Voucher", - description: "button" - }, category: { - defaultMessage: "Category", - description: "catalog item type" + defaultMessage: "Category" }, collection: { - defaultMessage: "Collection", - description: "catalog item type" + defaultMessage: "Collection" }, collectionPublished: { defaultMessage: "Published", @@ -37,10 +15,30 @@ const messages = defineMessages({ defaultMessage: "Not Published", description: "collection" }, + createCategory: { + defaultMessage: "Create Category", + description: "button" + }, + createCollection: { + defaultMessage: "Create Collection", + description: "button" + }, + createCustomer: { + defaultMessage: "Create Customer", + description: "button" + }, createOrder: { defaultMessage: "Create Order", description: "button" }, + createProduct: { + defaultMessage: "Create Product", + description: "button" + }, + createVoucher: { + defaultMessage: "Create Voucher", + description: "button" + }, customerWithName: { defaultMessage: "{firstName} {lastName}" }, @@ -76,8 +74,7 @@ const messages = defineMessages({ defaultMessage: "No Results" }, product: { - defaultMessage: "Product", - description: "catalog item type" + defaultMessage: "Product" } }); diff --git a/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx b/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx index f5e814572..eb050d8a1 100644 --- a/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx +++ b/src/customers/components/CustomerCreatePage/CustomerCreatePage.tsx @@ -150,7 +150,7 @@ const CustomerCreatePage: React.FC = ({ diff --git a/src/customers/components/CustomerListPage/CustomerListPage.tsx b/src/customers/components/CustomerListPage/CustomerListPage.tsx index ac761cdfa..5dd5715f7 100644 --- a/src/customers/components/CustomerListPage/CustomerListPage.tsx +++ b/src/customers/components/CustomerListPage/CustomerListPage.tsx @@ -50,7 +50,7 @@ const CustomerListPage: React.FC = ({ onClick={onAdd} > diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index 9c231db02..ec9718967 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -29700,7 +29700,7 @@ exports[`Storyshots Views / Customers / Create customer default 1`] = `
- Add Customer + Create Customer
- Add Customer + Create Customer
- Add Customer + Create Customer
- Add customer + Create customer
@@ -37802,7 +37802,7 @@ exports[`Storyshots Views / Customers / Customer list loading 1`] = ` - Add customer + Create customer @@ -38131,7 +38131,7 @@ exports[`Storyshots Views / Customers / Customer list no data 1`] = ` - Add customer + Create customer