djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #223 from mirumee/fix/copy

Browse source 
Fix copy
This commit is contained in:
Marcin Gębala 2019-10-21 16:46:24 +02:00 committed by GitHub
commit 2fd4c4d403
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
locale/messages.pot
View file

@ -1,6 +1,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"POT-Creation-Date: 2019-10-21T12:10:02.976Z\n" "POT-Creation-Date: 2019-10-21T14:35:07.777Z\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1628,13 +1628,21 @@ msgid "Cancel Fulfillment"
msgstr "" msgstr ""
#: build/locale/src/orders/components/OrderCancelDialog/OrderCancelDialog.json #: build/locale/src/orders/components/OrderCancelDialog/OrderCancelDialog.json
#. [src.orders.components.OrderCancelDialog.1258942306] - dialog header #. [OrderCancelDialogHeader] - dialog header
#. defaultMessage is: #. defaultMessage is:
#. Cancel Order #. Cancel Order
msgctxt "dialog header" msgctxt "dialog header"
msgid "Cancel Order" msgid "Cancel Order"
msgstr "" msgstr ""
#: build/locale/src/orders/components/OrderCancelDialog/OrderCancelDialog.json
#. [OrderCancelDialogButton] - button
#. defaultMessage is:
#. Cancel Order
msgctxt "button"
msgid "Cancel Order"
msgstr ""
#: build/locale/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.json #: build/locale/src/orders/components/OrderBulkCancelDialog/OrderBulkCancelDialog.json
#. [src.orders.components.OrderBulkCancelDialog.1528036340] - dialog header #. [src.orders.components.OrderBulkCancelDialog.1528036340] - dialog header
#. defaultMessage is: #. defaultMessage is:

2
src/components/ActionDialog/ActionDialog.tsx
View file

@ -60,7 +60,7 @@ const ActionDialog = withStyles(styles, { name: "ActionDialog" })(
<DialogContent>{children}</DialogContent> <DialogContent>{children}</DialogContent>
<DialogActions> <DialogActions>
<Button onClick={onClose}> <Button onClick={onClose}>
<FormattedMessage {...buttonMessages.cancel} /> <FormattedMessage {...buttonMessages.back} />
</Button> </Button>
<ConfirmButton <ConfirmButton
transitionState={confirmButtonState} transitionState={confirmButtonState}

2
src/components/SaveButtonBar/SaveButtonBar.tsx
View file

@ -121,7 +121,7 @@ export const SaveButtonBar = withStyles(styles, { name: "SaveButtonBar" })(
> >
{maybe( {maybe(
() => labels.cancel, () => labels.cancel,
intl.formatMessage(buttonMessages.cancel) intl.formatMessage(buttonMessages.back)
)} )}
</Button> </Button>
<ConfirmButton <ConfirmButton

7
src/orders/components/OrderCancelDialog/OrderCancelDialog.tsx
View file

@ -69,6 +69,7 @@ const OrderCancelDialog = withStyles(styles, { name: "OrderCancelDialog" })(
<FormattedMessage <FormattedMessage
defaultMessage="Cancel Order" defaultMessage="Cancel Order"
description="dialog header" description="dialog header"
id="OrderCancelDialogHeader"
/> />
</DialogTitle> </DialogTitle>
<DialogContent> <DialogContent>
@ -101,7 +102,11 @@ const OrderCancelDialog = withStyles(styles, { name: "OrderCancelDialog" })(
variant="contained" variant="contained"
type="submit" type="submit"
> >
<FormattedMessage {...buttonMessages.cancel} /> <FormattedMessage
defaultMessage="Cancel Order"
description="button"
id="OrderCancelDialogButton"
/>
</ConfirmButton> </ConfirmButton>
</DialogActions> </DialogActions>
</> </>