From bd679bb1eda29009ede65a2aaaa767080c354f80 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Tue, 20 Aug 2019 12:50:13 +0200
Subject: [PATCH] Improve labels

---
 .../CategoryDeleteDialog/CategoryDeleteDialog.tsx        | 6 +++---
 .../CategoryDetailsForm/CategoryDetailsForm.tsx          | 8 +++++---
 src/categories/components/CategoryList/CategoryList.tsx  | 4 ++--
 .../CategoryProductsCard/CategoryProductsCard.tsx        | 7 ++++---
 src/categories/views/CategoryDetails.tsx                 | 9 ++++-----
 src/categories/views/CategoryList.tsx                    | 2 +-
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx b/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx
index 70e87eeb0..6af3d4dca 100644
--- a/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx
+++ b/src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx
@@ -47,11 +47,11 @@ const CategoryDeleteDialog = withStyles(styles, {
     <DialogContent>
       <DialogContentText>
         <FormattedMessage
-          defaultMessage="Are you sure you want to remove {name}?"
+          defaultMessage="Are you sure you want to delete {categoryName}?"
           description="delete category"
-          id="<categoryDeleteDialogContent<"
+          id="categoryDeleteDialogContent"
           values={{
-            name: <strong>{name}</strong>
+            categoryName: <strong>{name}</strong>
           }}
         />
       </DialogContentText>
diff --git a/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx b/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx
index f85e469a5..a3b55141b 100644
--- a/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx
+++ b/src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx
@@ -54,8 +54,7 @@ export const CategoryDetailsForm = withStyles(styles, {
               <TextField
                 classes={{ root: classes.root }}
                 label={intl.formatMessage({
-                  defaultMessage: "Name",
-                  description: "category name",
+                  defaultMessage: "Category Name",
                   id: "categoryDetailsFormNameInputLabel"
                 })}
                 name="name"
@@ -71,7 +70,10 @@ export const CategoryDetailsForm = withStyles(styles, {
               disabled={disabled}
               error={!!errors.descriptionJson}
               helperText={errors.descriptionJson}
-              label={intl.formatMessage(commonMessages.description)}
+              label={intl.formatMessage({
+                defaultMessage: "Category Description",
+                id: "categoryDetailsFormDescriptionInputLabel"
+              })}
               initial={maybe(() => JSON.parse(category.descriptionJson))}
               name="description"
               onChange={onChange}
diff --git a/src/categories/components/CategoryList/CategoryList.tsx b/src/categories/components/CategoryList/CategoryList.tsx
index 8c44e3c3a..94a308238 100644
--- a/src/categories/components/CategoryList/CategoryList.tsx
+++ b/src/categories/components/CategoryList/CategoryList.tsx
@@ -134,8 +134,8 @@ const CategoryList = withStyles(styles, { name: "CategoryList" })(
             </TableCell>
             <TableCell className={classes.colProducts}>
               <FormattedMessage
-                defaultMessage="No. Products"
-                description="number of products in category"
+                defaultMessage="No. of Products"
+                description="number of products"
                 id="categoryListNumberOfProductsColumnHeader"
               />
             </TableCell>
diff --git a/src/categories/components/CategoryProductsCard/CategoryProductsCard.tsx b/src/categories/components/CategoryProductsCard/CategoryProductsCard.tsx
index a1f525a6c..6bf8277f7 100644
--- a/src/categories/components/CategoryProductsCard/CategoryProductsCard.tsx
+++ b/src/categories/components/CategoryProductsCard/CategoryProductsCard.tsx
@@ -31,17 +31,18 @@ export const CategoryProductsCard: React.StatelessComponent<
   toolbar
 }) => {
   const intl = useIntl();
+
   return (
     <Card>
       <CardTitle
         title={intl.formatMessage(
           {
-            defaultMessage: "Products in {name}",
-            description: "products in category, section header",
+            defaultMessage: "Products in {categoryName}",
+            description: "section header",
             id: "categoryProductsCardHeader"
           },
           {
-            name: categoryName
+            categoryName
           }
         )}
         toolbar={
diff --git a/src/categories/views/CategoryDetails.tsx b/src/categories/views/CategoryDetails.tsx
index 54a0d5da2..650c5c313 100644
--- a/src/categories/views/CategoryDetails.tsx
+++ b/src/categories/views/CategoryDetails.tsx
@@ -332,11 +332,10 @@ export const CategoryDetails: React.StatelessComponent<
                                   >
                                     <DialogContentText>
                                       <FormattedMessage
-                                        defaultMessage="Are you sure you want to delete {name}?"
-                                        description="delete category"
+                                        defaultMessage="Are you sure you want to delete {categoryName}?"
                                         id="categoryDetailsDeleteCategoryDialogContent"
                                         values={{
-                                          name: (
+                                          categoryName: (
                                             <strong>
                                               {maybe(
                                                 () => data.category.name,
@@ -349,7 +348,7 @@ export const CategoryDetails: React.StatelessComponent<
                                     </DialogContentText>
                                     <DialogContentText>
                                       <FormattedMessage
-                                        defaultMessage="Remember that this will also delete all products assigned to this category."
+                                        defaultMessage="Remember this will also delete all products assigned to this category."
                                         id="categoryDetailsDeleteCategoryDialogContentAdditionalText"
                                       />
                                     </DialogContentText>
@@ -393,7 +392,7 @@ export const CategoryDetails: React.StatelessComponent<
                                     </DialogContentText>
                                     <DialogContentText>
                                       <FormattedMessage
-                                        defaultMessage="Remember that this will also delete all products assigned to this category."
+                                        defaultMessage="Remember this will also delete all products assigned to this category."
                                         id="categoryDetailsDeleteCategoriesDialogContentAdditionalText"
                                       />
                                     </DialogContentText>
diff --git a/src/categories/views/CategoryList.tsx b/src/categories/views/CategoryList.tsx
index 61aa72c59..1a7b0d1a9 100644
--- a/src/categories/views/CategoryList.tsx
+++ b/src/categories/views/CategoryList.tsx
@@ -146,7 +146,7 @@ export const CategoryList: React.StatelessComponent<CategoryListProps> = ({
                     />
                     <DialogContentText>
                       <FormattedMessage
-                        defaultMessage="Remember that this will also delete all products assigned to this category."
+                        defaultMessage="Remember this will also delete all products assigned to this category."
                         id="categoryListDeleteCategoriesDialogContentAdditionalText"
                       />
                     </DialogContentText>