Initial go at localizing some components #1450
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import { ChromePicker } from 'react-color'; | |
| import { EuiOutsideClickDetector } from '../outside_click_detector'; | ||
|
|
||
| import { EuiColorPickerSwatch } from './color_picker_swatch'; | ||
| import { EuiI18n } from '../i18n'; | ||
|
|
||
| export class EuiColorPicker extends Component { | ||
| constructor(props) { | ||
|
|
@@ -30,15 +31,32 @@ export class EuiColorPicker extends Component { | |
| }; | ||
|
|
||
| getColorLabel() { | ||
| return ( | ||
| <EuiI18n | ||
| token="euiColorPicker.transparentColor" | ||
| default="transparent" | ||
| > | ||
| {transparentColor => { | ||
| const { color } = this.props; | ||
| const colorValue = color === null ? `(${transparentColor})` : color; | ||
| return ( | ||
| <EuiI18n | ||
| token="euiColorPicker.colorSelectionLabel" | ||
| default="Color selection is {colorValue}" | ||
| values={{ colorValue }} | ||
| > | ||
| {colorSelectionLabel => ( | ||
| <div | ||
| className="euiColorPicker__label" | ||
| aria-label={colorSelectionLabel} | ||
| > | ||
| { colorValue } | ||
| </div> | ||
| )} | ||
| </EuiI18n> | ||
| ); | ||
| }} | ||
| </EuiI18n> | ||
| ); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'; | |
| import classNames from 'classnames'; | ||
|
|
||
| import { EuiBadge } from '../../badge'; | ||
| import { EuiI18n } from '../../i18n'; | ||
|
|
||
| export class EuiComboBoxPill extends Component { | ||
| static propTypes = { | ||
|
|
@@ -47,23 +48,31 @@ export class EuiComboBoxPill extends Component { | |
|
|
||
| if (onClose) { | ||
| return ( | ||
| <EuiI18n | ||
| token="euiComboBoxPill.removeSelection" | ||
| default="Remove {children} from selection in this group" | ||
| values={{ children }} | ||
| > | ||
| {removeSelection => ( | ||
| <EuiBadge | ||
| className={classes} | ||
| title={children} | ||
| iconOnClick={this.onCloseButtonClick} | ||
| iconOnClickAriaLabel={removeSelection} | ||
| iconType="cross" | ||
| iconSide="right" | ||
| color={color} | ||
| closeButtonProps={{ | ||
| tabIndex: '-1', | ||
| }} | ||
| onClick={onClick} | ||
| onClickAriaLabel={onClickAriaLabel} | ||
| {...rest} | ||
| > | ||
| {children} | ||
| </EuiBadge> | ||
| )} | ||
| </EuiI18n> | ||
| ); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ import { EuiText } from '../../text'; | |
| import { EuiLoadingSpinner } from '../../loading'; | ||
| import { EuiComboBoxOption } from './combo_box_option'; | ||
| import { EuiComboBoxTitle } from './combo_box_title'; | ||
| import { EuiI18n } from '../../i18n'; | ||
|
|
||
| const positionToClassNameMap = { | ||
| top: 'euiComboBoxOptionsList--top', | ||
|
|
@@ -129,7 +130,7 @@ export class EuiComboBoxOptionsList extends Component { | |
| <EuiLoadingSpinner size="m" /> | ||
| </EuiFlexItem> | ||
| <EuiFlexItem grow={false}> | ||
| <EuiI18n token="euiComboBoxOptionsList.loadingOptions" default="Loading options"/> | ||
| </EuiFlexItem> | ||
| </EuiFlexGroup> | ||
| ); | ||
|
|
@@ -139,22 +140,48 @@ export class EuiComboBoxOptionsList extends Component { | |
| if (selectedOptionForValue) { | ||
| // Disallow duplicate custom options. | ||
| emptyStateContent = ( | ||
| <p> | ||
| <EuiI18n | ||
| token="euiComboBoxOptionsList.alreadyAdded" | ||
| default="{label} has already been added" | ||
| values={{ label: <strong>{selectedOptionForValue.label}</strong> }} | ||
| /> | ||
| </p> | ||
| ); | ||
| } else { | ||
| emptyStateContent = ( | ||
| <p> | ||
| <EuiI18n | ||
| token="euiComboBoxOptionsList.createCustomOption" | ||
| default="Hit {key} to add {searchValue} as a custom option" | ||
| values={{ key: <EuiCode>ENTER</EuiCode>, searchValue: <strong>{searchValue}</strong> }} | ||
|
There was a problem hiding this comment. Should There was a problem hiding this comment. It is still localizable, the consumer can ignore that default value in their formatting: Since react-intl allows JSX in the translations, the key value can be ignored and the localized value put directly into the message. |
||
| /> | ||
| </p> | ||
| ); | ||
| } | ||
| } else { | ||
| emptyStateContent = ( | ||
| <p> | ||
| <EuiI18n | ||
| token="euiComboBoxOptionsList.noMatchingOptions" | ||
| default="{searchValue} doesn't match any options" | ||
| values={{ searchValue: <strong>{searchValue}</strong> }} | ||
| /> | ||
| </p> | ||
| ); | ||
| } | ||
| } else if (!options.length) { | ||
| emptyStateContent = ( | ||
| <p> | ||
| <EuiI18n token="euiComboBoxOptionsList.noAvailableOptions" default="There aren't any options available"/> | ||
| </p> | ||
| ); | ||
| } else if (areAllOptionsSelected) { | ||
| emptyStateContent = ( | ||
| <p> | ||
| <EuiI18n token="euiComboBoxOptionsList.allOptionsSelected" default="You've selected all available options"/> | ||
| </p> | ||
| ); | ||
| } | ||
|
|
||
| const emptyState = emptyStateContent ? ( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this getting localised too? Not obvious that it is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No,
activityLabelis used in forming the tokens later. However, how I'm using it here breaks the planned static analysis of tokens, I'll refactor.