Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Transfer - lists labels - English Translation #3264

Merged
merged 4 commits into from
Oct 8, 2016
Merged

Transfer - lists labels - English Translation #3264

merged 4 commits into from
Oct 8, 2016

Conversation

kvetoslavnovak
Copy link
Contributor

No description provided.

@mention-bot
Copy link

@kvetoslavnovak, thanks for your PR! By analyzing the annotation information on this pull request, we identified @benjycui, @liqi07 and @visvadw to be potential reviewers

@benjycui
Copy link
Contributor

benjycui commented Oct 1, 2016 •
edited
Loading

It seems that it is a bug that Transfer[titles] is not under the control of LocaleProvider

@benjycui benjycui self-assigned this Oct 1, 2016
@kvetoslavnovak
Copy link
Contributor Author

@benjycui should it be add as an independent new issue or will you solve it within this translation PR?

@benjycui
Copy link
Contributor

benjycui commented Oct 2, 2016

I will fix this bug, then merge this PR.

Keep this PR open to remind me.

dxps
dxps reviewed Oct 2, 2016
View reviewed changes
components/transfer/index.en-US.md
@@ -25,7 25,7 @@ To transfer the elements between two columns in an intuitive and efficient way.
| onSelectChange | A callback function which is executed when selected items are changed. | Function(sourceSelectedKeys, targetSelectedKeys) | |
| listStyle | A custom CSS style used for rendering the transfer columns. | Object | |
| className | A custom CSS class. | String | |
| titles | A set of titles that are sorted from left to right. | Array | ['源列表', '目的列表'] |
| titles | A set of titles that are sorted from left to right. | Array | ['Source list', 'Target list'] |
| operations | A set of operations that are sorted form top to bottom. | Array | [] |
| showSearch | If included, a search box is shown on each column. | Boolean | false |
| searchPlaceholder | The hint text of the search box. | String | 'Please input the content' |
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

| searchPlaceholder | The hint text of the search box. | String | 'Search ...' |

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be 'Search here'

Copy link
Contributor Author

@kvetoslavnovak kvetoslavnovak Oct 8, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated with 'Search here'

components/transfer/index.en-US.md
@@ -25,7 25,7 @@ To transfer the elements between two columns in an intuitive and efficient way.
| onSelectChange | A callback function which is executed when selected items are changed. | Function(sourceSelectedKeys, targetSelectedKeys) | |
| listStyle | A custom CSS style used for rendering the transfer columns. | Object | |
| className | A custom CSS class. | String | |
| titles | A set of titles that are sorted from left to right. | Array | ['源列表', '目的列表'] |
| titles | A set of titles that are sorted from left to right. | Array | ['Source list', 'Target list'] |
| operations | A set of operations that are sorted form top to bottom. | Array | [] |
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

| operations | A set of operations that are sorted from top to bottom. | Array | [] |

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep.. typo

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

@kvetoslavnovak kvetoslavnovak mentioned this pull request Oct 6, 2016
Closed
18 tasks
@kvetoslavnovak
Copy link
Contributor Author

kvetoslavnovak commented Oct 7, 2016 •
edited
Loading

@benjycui I tried to track it.
There is no property Transfer[titles] in LocaleProvider https://github.com/ant-design/ant-design/blob/master/components/locale-provider/en_US.tsx (lines 29-34)
Trasnfer component has hardcoded titles in Chinese as a static defaultProps array https://github.com/ant-design/ant-design/blob/master/components/transfer/index.tsx (line 51)

benjycui added a commit that referenced this pull request Oct 8, 2016
@benjycui
fix: Transfer[title] should follow LocaleProvider, ref: #3264
44c86c1
@benjycui benjycui mentioned this pull request Oct 8, 2016
Merged
@benjycui
Copy link
Contributor

benjycui commented Oct 8, 2016

@kvetoslavnovak could you update your PR according to review?

@benjycui
Copy link
Contributor

benjycui commented Oct 8, 2016

And this PR will be merged after #3318

afc163 pushed a commit that referenced this pull request Oct 8, 2016
@benjycui @afc163
fix: Transfer[title] should follow LocaleProvider, ref: #3264 (#3318)
a987e34
@kvetoslavnovak kvetoslavnovak changed the title Transfer - lists labels - English Translation Transfer[title] should follow LocaleProvider Oct 8, 2016
@kvetoslavnovak
Copy link
Contributor Author

kvetoslavnovak commented Oct 8, 2016 •
edited
Loading

Updated, can be merged after #3318

@kvetoslavnovak kvetoslavnovak reopened this Oct 8, 2016
@benjycui benjycui merged commit 2aba5ea into ant-design:master Oct 8, 2016
@kvetoslavnovak kvetoslavnovak changed the title Transfer[title] should follow LocaleProvider Transfer - lists labels - English Translation Oct 8, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dxps dxps dxps left review comments

@benjycui benjycui benjycui left review comments

Assignees

@benjycui benjycui

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kvetoslavnovak @mention-bot @benjycui @dxps