Feature/dashboard translations #24328
Merged
Conversation
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
|
blocked by #23684 |
💔 Build Failed |
|
retest |
💔 Build Failed |
| defaultFocusedButton: ConfirmationButtonTypes.CANCEL, | ||
| title: 'Discard changes to dashboard?' | ||
| title: i18n('kbn.dashboard.app.changeViewModeConfirmModal.title', |
There was a problem hiding this comment.
Maybe .title -> .discardChangesTitle?
| @@ -268,14 +270,22 @@ app.directive('dashboardApp', function ($injector) { | |||
| } | |||
|
|
|||
| confirmModal( | |||
| `Once you discard your changes, there's no getting them back.`, | |||
| i18n('kbn.dashboard.app.changeViewModeConfirmModal.description', | |||
There was a problem hiding this comment.
Maybe .description -> .discardChangesDescription?
|
|
||
| const displayTitle = `${title}${unsavedSuffix}`; | ||
| return isEditMode ? 'Editing ' + displayTitle : displayTitle; | ||
| if (isEditMode && isDirty && isEditMode) { |
There was a problem hiding this comment.
Duplication of isEditMode in this condition.
I think it can be
if (isEditMode && isDirty) {
displayTitle = i18n.translate('kbn.dashboard.strings.dashboardUnsavedEditTitle', {
defaultMessage: 'Editing {title} (unsaved)',
title,
});
} else if (isEditMode) {
displayTitle = i18n.translate('kbn.dashboard.strings.dashboardEditTitle', {
defaultMessage: 'Editing {title}',
title,
});
} else {
displayTitle = title;
}
| @@ -106,7 +107,7 @@ function ResponsiveGrid({ | |||
| const ResponsiveSizedGrid = sizeMe(config)(ResponsiveGrid); | |||
|
|
|||
|
|
|||
| export class DashboardGrid extends React.Component { | |||
| export class DashboardGridUi extends React.Component { | |||
There was a problem hiding this comment.
Please remove export.
| @@ -106,7 +107,7 @@ function ResponsiveGrid({ | |||
| const ResponsiveSizedGrid = sizeMe(config)(ResponsiveGrid); | |||
|
|
|||
|
|
|||
| export class DashboardGrid extends React.Component { | |||
| export class DashboardGridUi extends React.Component { | |||
There was a problem hiding this comment.
Please remove export.
| @@ -141,8 +165,12 @@ uiRoutes | |||
| FeatureCatalogueRegistryProvider.register(() => { | |||
| return { | |||
| id: 'dashboard', | |||
| title: 'Dashboard', | |||
| description: 'Display and share a collection of visualizations and saved searches.', | |||
| title: i18n.translate('kbn.dashboard.featureCatalogue.dashboard.title', { | |||
There was a problem hiding this comment.
kbn.dashboard.featureCatalogue.dashboard.title -> kbn.dashboard.featureCatalogue.dashboardTitle
| title: i18n.translate('kbn.dashboard.featureCatalogue.dashboard.title', { | ||
| defaultMessage: 'Dashboard', | ||
| }), | ||
| description: i18n.translate('kbn.dashboard.featureCatalogue.dashboard.description', { |
There was a problem hiding this comment.
-> .dashboardDescription
| @@ -194,14 +197,27 @@ export class DashboardListing extends React.Component { | |||
| return ( | |||
| <EuiOverlayMask> | |||
| <EuiConfirmModal | |||
| title="Delete selected dashboards?" | |||
| title={this.props.intl.formatMessage('kbn.dashboard.listing.deleteSelectedDashboardsConfirmModal.title', { | |||
There was a problem hiding this comment.
I believe it's worth to create a variable for this.props.intl.
| @@ -212,14 +228,35 @@ export class DashboardListing extends React.Component { | |||
| return ( | |||
| <React.Fragment> | |||
| <EuiCallOut | |||
| title="Listing limit exceeded" | |||
| title={this.props.intl.formatMessage('kbn.dashboard.listing.listingLimitExceeded.title', { | |||
| but your <strong>listingLimit</strong> setting prevents the table below from displaying more than {this.props.listingLimit}. | ||
| You can change this setting under <EuiLink href="#/management/kibana/settings">Advanced Settings</EuiLink>. | ||
| {this.props.intl.formatMessage('kbn.dashboard.listing.listingLimitExceeded.description', { | ||
| defaultMessage: 'You have {totalDashboards} dashboards, \ |
There was a problem hiding this comment.
Please do not use \, because browsers behave different with multiline javascript strings by using \.
Moreover in jsx it's necessary to use \ for multiline string in template. This should work:
defaultMessage: 'You have {totalDashboards} dashboards, but your {listingLimitText} setting prevents the table below from displaying more than {listingLimitValue}. You can change this setting under {advancedSettingsLink}.'
| @@ -304,7 +375,9 @@ export class DashboardListing extends React.Component { | |||
| <EuiFlexItem grow={true}> | |||
| <EuiFieldSearch | |||
| aria-label="Filter dashboards" | |||
There was a problem hiding this comment.
This aria-label should be translated as well.
| @@ -304,7 +375,9 @@ export class DashboardListing extends React.Component { | |||
| <EuiFlexItem grow={true}> | |||
| <EuiFieldSearch | |||
| aria-label="Filter dashboards" | |||
| placeholder="Search..." | |||
| placeholder={this.props.intl.formatMessage('kbn.dashboard.listing.searchBar.searchField.placeholder', { | |||
There was a problem hiding this comment.
-> .searchFieldPlaceholder
| @@ -304,7 +375,9 @@ export class DashboardListing extends React.Component { | |||
| <EuiFlexItem grow={true}> | |||
| <EuiFieldSearch | |||
| aria-label="Filter dashboards" | |||
| placeholder="Search..." | |||
| placeholder={this.props.intl.formatMessage('kbn.dashboard.listing.searchBar.searchField.placeholder', { | |||
| defaultMessage: 'Search...', | |||
There was a problem hiding this comment.
Please use … instead of three dots.
| @@ -323,7 +396,9 @@ export class DashboardListing extends React.Component { | |||
| const tableColumns = [ | |||
| { | |||
| field: 'title', | |||
| name: 'Title', | |||
| name: this.props.intl.formatMessage('kbn.dashboard.listing.table.titleColumn.title', { | |||
There was a problem hiding this comment.
-> .titleColumnTitle
and please fix the same in ids below
| {!this.props.initialized && 'loading...'} | ||
| {!this.props.initialized && <FormattedMessage | ||
| id="kbn.dashboard.panel.ebmeddableViewport.loadingLabel" | ||
| defaultMessage="loading..." |
There was a problem hiding this comment.
Please use … instead of three dots.
| }: PanelOptionsMenuProps) { | ||
| const button = ( | ||
| <EuiButtonIcon | ||
| iconType={isViewMode ? 'boxesHorizontal' : 'gear'} | ||
| color="text" | ||
| className={isViewMode && !isPopoverOpen ? 'dshPanel_optionsMenuButton' : ''} | ||
| aria-label="Panel options" | ||
| aria-label={intl.formatMessage({ | ||
| id: 'kbn.dashboard.panel.optionsMenu.panelOptionsButton.ariaLabel', |
There was a problem hiding this comment.
-> .panelOptionsButtonAriaLabel
| @@ -55,13 +62,21 @@ export function PanelOptionsMenuForm({ | |||
| value={title} | |||
| onChange={onInputChange} | |||
| onKeyDown={onKeyDown} | |||
| aria-label="Changes to this input are applied immediately. Press enter to exit." | |||
| aria-label={intl.formatMessage({ | |||
| id: 'kbn.dashboard.panel.optionsMenuForm.titleInput.ariaLabel', | |||
There was a problem hiding this comment.
-> .panelTitleInputAriaLabel
| @@ -78,7 +85,10 @@ export class PanelUtils { | |||
| static parseVersion(version = '6.0.0') { | |||
| const versionSplit = version.split('.'); | |||
| if (versionSplit.length < 3) { | |||
| throw new Error(`Invalid version, ${version}, expected <major>.<minor>.<patch>`); | |||
| throw new Error(i18n.translate('kbn.dashboard.panel.invalidVersionErrorMessage', { | |||
| defaultMessage: 'Invalid version, {version}, expected <major>.<minor>.<patch>', | |||
There was a problem hiding this comment.
I would put <major>.<minor>.<patch> in values.
| @@ -115,7 +131,13 @@ export class DashboardAddPanel extends React.Component { | |||
| } | |||
|
|
|||
| this.lastToast = toastNotifications.addSuccess({ | |||
| title: `${this.state.selectedTab.name} was added to your dashboard`, | |||
| title: this.props.intl.formatMessage({ | |||
| id: 'kbn.dashboard.topNav.addPanel.toastNotifications.selectedTadAddedToDashboardSuccessMessageTitle', | |||
There was a problem hiding this comment.
typo -> .selectedTabAddedToDashboardSuccessMessageTitle
💔 Build Failed |
💔 Build Failed |
|
Check the This functional test failure also looks like it could be related: |
|
@tsullivan yes, this is because old phantom browser (Safari 7) doesn't support Internationalization API. We are working on this issue #25465. |
|
Blocked by #25465. |
💔 Build Failed |
💚 Build Succeeded |
💔 Build Failed |
💚 Build Succeeded |
pavel06081991
added a commit
to pavel06081991/kibana
that referenced
this pull request
Nov 20, 2018
add dashboard translations
pavel06081991
added a commit
that referenced
this pull request
Nov 20, 2018
💔 Build Failed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
dashboard translations
Fixes: #22648