Merge branch 'master' into fix/attributes

CHANGELOG.md

@@ -41,4 +41,5 @@ All notable, unreleased changes to this project will be documented in this file.
 - Improve autocomplete UX - #212 by @dominik-zeglen
 - Fix empty attribute values - #218 by @dominik-zeglen
 - Add language switch - #213 by @dominik-zeglen
+- Fix copy - #223, #224 by @dominik-zeglen
 - Fix attribute errors - #216 by @dominik-zeglen

src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx

@@ -83,7 +83,7 @@ const AttributeValueEditDialog: React.StatelessComponent<
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}

src/categories/components/CategoryDeleteDialog/CategoryDeleteDialog.tsx

@@ -56,7 +56,7 @@ const CategoryDeleteDialog = withStyles(styles, {
     </DialogContent>
     <DialogActions>
       <Button onClick={onClose}>
-        <FormattedMessage {...buttonMessages.cancel} />
+        <FormattedMessage {...buttonMessages.back} />
       </Button>
       <Button
         className={classes.deleteButton}

src/components/AssignCategoryDialog/AssignCategoryDialog.tsx

@@ -161,7 +161,7 @@ const AssignCategoriesDialog = withStyles(styles, {
         </DialogContent>
         <DialogActions>
           <Button onClick={onClose}>
-            <FormattedMessage {...buttonMessages.cancel} />
+            <FormattedMessage {...buttonMessages.back} />
           </Button>
           <ConfirmButton
             transitionState={confirmButtonState}

src/components/AssignCollectionDialog/AssignCollectionDialog.tsx

@@ -162,7 +162,7 @@ const AssignCollectionDialog = withStyles(styles, {
         </DialogContent>
         <DialogActions>
           <Button onClick={onClose}>
-            <FormattedMessage {...buttonMessages.cancel} />
+            <FormattedMessage {...buttonMessages.back} />
           </Button>
           <ConfirmButton
             transitionState={confirmButtonState}

src/components/AssignProductDialog/AssignProductDialog.tsx

@@ -174,7 +174,7 @@ const AssignProductDialog = withStyles(styles, {
         </DialogContent>
         <DialogActions>
           <Button onClick={onClose}>
-            <FormattedMessage {...buttonMessages.cancel} />
+            <FormattedMessage {...buttonMessages.back} />
           </Button>
           <ConfirmButton
             transitionState={confirmButtonState}

src/components/SaveFilterTabDialog/SaveFilterTabDialog.tsx

@@ -71,7 +71,7 @@ const SaveFilterTabDialog: React.FC<SaveFilterTabDialogProps> = ({
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}

src/customers/components/CustomerAddressDialog/CustomerAddressDialog.tsx

@@ -122,7 +122,7 @@ const CustomerAddressDialog = withStyles(styles, {})(
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}

src/discounts/components/DiscountCountrySelectDialog/DiscountCountrySelectDialog.tsx

@@ -176,7 +176,7 @@ const DiscountCountrySelectDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}

src/navigation/components/MenuCreateDialog/MenuCreateDialog.tsx

@@ -67,7 +67,7 @@ const MenuCreateDialog: React.FC<MenuCreateDialogProps> = ({
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}

src/navigation/components/MenuItemDialog/MenuItemDialog.tsx

@@ -289,7 +289,7 @@ const MenuItemDialog: React.StatelessComponent<MenuItemDialogProps> = ({
       </DialogContent>
       <DialogActions>
         <Button onClick={onClose}>
-          <FormattedMessage {...buttonMessages.cancel} />
+          <FormattedMessage {...buttonMessages.back} />
         </Button>
         <ConfirmButton
           transitionState={confirmButtonState}

src/orders/components/OrderAddressEditDialog/OrderAddressEditDialog.tsx

@@ -103,7 +103,7 @@ const OrderAddressEditDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}

src/orders/components/OrderFulfillmentDialog/OrderFulfillmentDialog.tsx

@@ -203,7 +203,7 @@ const OrderFulfillmentDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}

src/orders/components/OrderFulfillmentTrackingDialog/OrderFulfillmentTrackingDialog.tsx

@@ -54,7 +54,7 @@ const OrderFulfillmentTrackingDialog: React.StatelessComponent<
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}

src/orders/components/OrderPaymentDialog/OrderPaymentDialog.tsx

@@ -79,7 +79,7 @@ const OrderPaymentDialog: React.StatelessComponent<OrderPaymentDialogProps> = ({
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <ConfirmButton
                 transitionState={confirmButtonState}

src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx

@@ -328,7 +328,7 @@ const OrderProductAddDialog = withStyles(styles, {
         </DialogContent>
         <DialogActions>
           <Button onClick={onClose}>
-            <FormattedMessage {...buttonMessages.cancel} />
+            <FormattedMessage {...buttonMessages.back} />
           </Button>
           <ConfirmButton
             transitionState={confirmButtonState}

src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx

@@ -104,7 +104,7 @@ const OrderShippingMethodEditDialog = withStyles(styles, {
               </DialogContent>
               <DialogActions>
                 <Button onClick={onClose}>
-                  <FormattedMessage {...buttonMessages.cancel} />
+                  <FormattedMessage {...buttonMessages.back} />
                 </Button>
                 <ConfirmButton
                   transitionState={confirmButtonState}

src/productTypes/components/AssignAttributeDialog/AssignAttributeDialog.tsx

@@ -181,7 +181,7 @@ const AssignAttributeDialog: React.FC<AssignAttributeDialogProps> = ({
       )}
       <DialogActions>
         <Button onClick={onClose}>
-          <FormattedMessage {...buttonMessages.cancel} />
+          <FormattedMessage {...buttonMessages.back} />
         </Button>
         <ConfirmButton
           transitionState={confirmButtonState}

src/productTypes/components/ProductTypeAttributeEditDialog/ProductTypeAttributeEditDialog.tsx

@@ -90,7 +90,7 @@ const ProductTypeAttributeEditDialog: React.StatelessComponent<
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <Button color="primary" variant="contained" type="submit">
                 <FormattedMessage {...buttonMessages.confirm} />

src/products/components/ProductVariantDeleteDialog/ProductVariantDeleteDialog.tsx

@@ -69,7 +69,7 @@ const ProductVariantDeleteDialog = withStyles(styles, {
       </DialogContent>
       <DialogActions>
         <Button onClick={onClose}>
-          <FormattedMessage {...buttonMessages.cancel} />
+          <FormattedMessage {...buttonMessages.back} />
         </Button>
         <ConfirmButton
           transitionState={confirmButtonState}

src/services/components/ServiceTokenCreateDialog/ServiceTokenCreateDialog.tsx

@@ -134,7 +134,7 @@ const ServiceTokenCreateDialog: React.FC<
                     color="primary"
                     onClick={onClose}
                   >
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}

src/shipping/components/ShippingZoneCountriesAssignDialog/ShippingZoneCountriesAssignDialog.tsx

@@ -214,7 +214,7 @@ const ShippingZoneCountriesAssignDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     transitionState={confirmButtonState}

src/shipping/components/ShippingZoneRateDialog/ShippingZoneRateDialog.tsx

@@ -327,7 +327,7 @@ const ShippingZoneRateDialog = withStyles(styles, {
                 </DialogContent>
                 <DialogActions>
                   <Button onClick={onClose}>
-                    <FormattedMessage {...buttonMessages.cancel} />
+                    <FormattedMessage {...buttonMessages.back} />
                   </Button>
                   <ConfirmButton
                     disabled={disabled || !hasChanged}

src/siteSettings/components/SiteSettingsKeyDialog/SiteSettingsKeyDialog.tsx

@@ -89,7 +89,7 @@ const SiteSettingsKeyDialog: React.StatelessComponent<
             </DialogContent>
             <DialogActions>
               <Button onClick={onClose}>
-                <FormattedMessage {...buttonMessages.cancel} />
+                <FormattedMessage {...buttonMessages.back} />
               </Button>
               <Button color="primary" type="submit" variant="contained">
                 <FormattedMessage

src/staff/components/StaffAddMemberDialog/StaffAddMemberDialog.tsx

@@ -141,7 +141,7 @@ const StaffAddMemberDialog = withStyles(styles, {
               </DialogContent>
               <DialogActions>
                 <Button onClick={onClose}>
-                  <FormattedMessage {...buttonMessages.cancel} />
+                  <FormattedMessage {...buttonMessages.back} />
                 </Button>
                 <ConfirmButton
                   color="primary"