Skip to content

Commit

Permalink
Merge pull request #1243 from Shopify/fix-cancel-text
Browse files Browse the repository at this point in the history
[ResourceList] - Adding bulk action cancel button translation
  • Loading branch information
dleroux authored Mar 26, 2019
2 parents f5a8e04 + 839e900 commit f82a661
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f

- Fixed disabled states while loading for `ResourceList` ([#1237](https://github.com/Shopify/polaris-react/pull/1237))
- Fixed `Checkbox` from losing focus and not receiving some modified events([#1112](https://github.com/Shopify/polaris-react/pull/1112))
- Added translation for the cancel button on the `ResourceList` `BulkActions` ([#1243](https://github.com/Shopify/polaris-react/pull/1243))

### Documentation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export class BulkActions extends React.PureComponent<CombinedProps, State> {
testID="btn-cancel"
disabled={disabled}
>
Cancel
{intl.translate('Polaris.Common.cancel')}
</button>
);

Expand Down
3 changes: 2 additions & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@

"Common": {
"checkbox": "checkbox",
"undo": "Undo"
"undo": "Undo",
"cancel": "Cancel"
},

"ContextualSaveBar": {
Expand Down

0 comments on commit f82a661

Please sign in to comment.