From b7af462dc02149a936f7d962db08c187dd267cd0 Mon Sep 17 00:00:00 2001 From: pavel06081991 Date: Fri, 14 Dec 2018 19:08:04 +0300 Subject: [PATCH] [i18n] Translate missing labels in Dev Tools and Management (#26965) (#27214) * Translate missings labels in dev tools and management * Fix issues * Add translation for k7Breadcrumbs --- .../kibana/public/dev_tools/index.js | 10 ++++-- .../kibana/public/management/index.js | 10 ++++-- .../components/header/__jest__/header.test.js | 14 ++++---- .../components/header/header.js | 14 ++++++-- .../loading_indices.test.js.snap | 4 +-- .../loading_indices/loading_indices.js | 4 +-- .../step_time_field.test.js.snap | 2 +- .../__snapshots__/time_field.test.js.snap | 2 +- .../components/time_field/time_field.js | 2 +- .../step_time_field/step_time_field.js | 2 +- .../components/create_button/create_button.js | 9 +++++- .../management/sections/objects/_objects.js | 11 ++++--- .../components/objects_table/objects_table.js | 7 ++-- .../field/__snapshots__/field.test.js.snap | 32 ++++++++++++++++--- .../settings/components/field/field.js | 12 ++++++- .../management/sections/settings/index.js | 10 ++++-- 16 files changed, 106 insertions(+), 39 deletions(-) diff --git a/src/legacy/core_plugins/kibana/public/dev_tools/index.js b/src/legacy/core_plugins/kibana/public/dev_tools/index.js index f46369a1b921..b4d58fcc1380 100644 --- a/src/legacy/core_plugins/kibana/public/dev_tools/index.js +++ b/src/legacy/core_plugins/kibana/public/dev_tools/index.js @@ -32,11 +32,15 @@ uiRoutes } }); -FeatureCatalogueRegistryProvider.register(() => { +FeatureCatalogueRegistryProvider.register(i18n => { return { id: 'console', - title: 'Console', - description: 'Skip cURL and use this JSON interface to work with your data directly.', + title: i18n('kbn.devTools.consoleTitle', { + defaultMessage: 'Console' + }), + description: i18n('kbn.devTools.consoleDescription', { + defaultMessage: 'Skip cURL and use this JSON interface to work with your data directly.' + }), icon: 'consoleApp', path: '/app/kibana#/dev_tools/console', showOnHomePage: true, diff --git a/src/legacy/core_plugins/kibana/public/management/index.js b/src/legacy/core_plugins/kibana/public/management/index.js index 6b327686366c..9c2261fb6590 100644 --- a/src/legacy/core_plugins/kibana/public/management/index.js +++ b/src/legacy/core_plugins/kibana/public/management/index.js @@ -86,11 +86,15 @@ uiModules }; }); -FeatureCatalogueRegistryProvider.register(() => { +FeatureCatalogueRegistryProvider.register(i18n => { return { id: 'management', - title: 'Management', - description: 'Your center console for managing the Elastic Stack.', + title: i18n('kbn.management.managementLabel', { + defaultMessage: 'Management', + }), + description: i18n('kbn.management.managementDescription', { + defaultMessage: 'Your center console for managing the Elastic Stack.', + }), icon: 'managementApp', path: '/app/kibana#/management', showOnHomePage: false, diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/header.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/header.test.js index 70f3642e3da2..a6766eb86560 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/header.test.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/__jest__/header.test.js @@ -19,12 +19,12 @@ import React from 'react'; import { Header } from '../header'; -import { shallow } from 'enzyme'; +import { shallowWithIntl } from 'test_utils/enzyme_helpers'; describe('Header', () => { it('should render normally', () => { - const component = shallow( -
{}} /> @@ -34,8 +34,8 @@ describe('Header', () => { }); it('should render without including system indices', () => { - const component = shallow( -
{}} /> @@ -45,8 +45,8 @@ describe('Header', () => { }); it('should render a different name, prompt, and beta tag if provided', () => { - const component = shallow( -
{}} prompt={
Test prompt
} diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/header.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/header.js index cefd6141e63f..defd15e67e1d 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/header.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/header/header.js @@ -30,15 +30,16 @@ import { EuiSwitch, } from '@elastic/eui'; -import { FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage, injectI18n } from '@kbn/i18n/react'; -export const Header = ({ +const HeaderUi = ({ prompt, indexPatternName, showSystemIndices, isIncludingSystemIndices, onChangeIncludingSystemIndices, isBeta, + intl }) => (
@@ -53,7 +54,12 @@ export const Header = ({ { isBeta ? ( {' '} - + ) : null } @@ -98,3 +104,5 @@ export const Header = ({
); + +export const Header = injectI18n(HeaderUi); diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__jest__/__snapshots__/loading_indices.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__jest__/__snapshots__/loading_indices.test.js.snap index ddad76b12b74..74e8350e4bfe 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__jest__/__snapshots__/loading_indices.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__jest__/__snapshots__/loading_indices.test.js.snap @@ -31,7 +31,7 @@ exports[`LoadingIndices should render normally 1`] = ` component="span" > @@ -51,7 +51,7 @@ exports[`LoadingIndices should render normally 1`] = ` component="span" > diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.js index bcf25cd36397..377a65003751 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/loading_indices.js @@ -44,7 +44,7 @@ export const LoadingIndices = ({ ...rest }) => ( @@ -53,7 +53,7 @@ export const LoadingIndices = ({ ...rest }) => ( diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap index 98f052372b81..65725439490d 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap @@ -46,7 +46,7 @@ exports[`StepTimeField should render a loading state when creating the index pat size="m" > diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap index 1014cf86962d..524990c5daf8 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap @@ -68,7 +68,7 @@ exports[`TimeField should render a loading state 1`] = ` options={ Array [ Object { - "text": "Loading...", + "text": "Loading…", "value": "", }, ] diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.js index 0e87d80e5316..77a541d1ff7a 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/components/time_field/time_field.js @@ -100,7 +100,7 @@ export const TimeFieldComponent = ({ { text: intl.formatMessage({ id: 'kbn.management.createIndexPattern.stepTime.field.loadingDropDown', - defaultMessage: 'Loading...' + defaultMessage: 'Loading…' }), value: '' } diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/step_time_field.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/step_time_field.js index 13353d41e5ad..2b2e588da78a 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/step_time_field.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_time_field/step_time_field.js @@ -138,7 +138,7 @@ export class StepTimeFieldComponent extends Component { diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/index_pattern_list/components/create_button/create_button.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/index_pattern_list/components/create_button/create_button.js index 5e20bf6f60df..717a13d72928 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/index_pattern_list/components/create_button/create_button.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/index_pattern_list/components/create_button/create_button.js @@ -33,6 +33,8 @@ import { rgbToHex, } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; + export class CreateButton extends Component { constructor(props) { super(props); @@ -64,7 +66,12 @@ export class CreateButton extends Component { renderBetaBadge = () => { const color = rgbToHex(euiColorAccent); return ( - Beta + + + ); }; diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.js index d707596bdc04..8becc7ae8611 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/_objects.js @@ -34,7 +34,7 @@ import { getIndexBreadcrumbs } from './breadcrumbs'; const REACT_OBJECTS_TABLE_DOM_ELEMENT_ID = 'reactSavedObjectsTable'; -function updateObjectsTable($scope, $injector) { +function updateObjectsTable($scope, $injector, i18n) { const Private = $injector.get('Private'); const indexPatterns = $injector.get('indexPatterns'); const $http = $injector.get('$http'); @@ -70,7 +70,10 @@ function updateObjectsTable($scope, $injector) { } const serviceName = typeToServiceName(type); if (!serviceName) { - toastNotifications.addWarning(`Unknown saved object type: ${type}`); + toastNotifications.addWarning(i18n('kbn.management.objects.unknownSavedObjectTypeNotificationMessage', { + defaultMessage: 'Unknown saved object type: {type}', + values: { type } + })); return null; } @@ -106,8 +109,8 @@ uiModules.get('apps/management') return { restrict: 'E', controllerAs: 'managementObjectsController', - controller: function ($scope, $injector) { - updateObjectsTable($scope, $injector); + controller: function ($scope, $injector, i18n) { + updateObjectsTable($scope, $injector, i18n); $scope.$on('$destroy', destroyObjectsTable); } }; diff --git a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js index 0680ea22b225..7158e3113ec3 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js @@ -164,7 +164,7 @@ class ObjectsTableUI extends Component { } debouncedFetch = debounce(async () => { - const { savedObjectsClient } = this.props; + const { intl, savedObjectsClient } = this.props; const { activeQuery: query, page, perPage } = this.state; const { queryText, visibleTypes } = parseQuery(query); const findOptions = { @@ -191,7 +191,10 @@ class ObjectsTableUI extends Component { }); } toastNotifications.addDanger({ - title: `Unable find saved objects`, + title: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.unableFindSavedObjectsNotificationMessage', + defaultMessage: 'Unable find saved objects' + }), text: `${error}`, }); return; diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap index 8d8a93aad3a7..195f864fa428 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap +++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap @@ -470,7 +470,13 @@ exports[`Field for boolean setting should render as read only with help text if checked={false} data-test-subj="advancedSetting-editField-boolean:test:setting" disabled={true} - label="Off" + label={ + + } onChange={[Function]} onKeyDown={[Function]} /> @@ -552,7 +558,13 @@ exports[`Field for boolean setting should render custom setting icon if it is cu checked={true} data-test-subj="advancedSetting-editField-boolean:test:setting" disabled={false} - label="On" + label={ + + } onChange={[Function]} onKeyDown={[Function]} /> @@ -623,7 +635,13 @@ exports[`Field for boolean setting should render default value if there is no us checked={true} data-test-subj="advancedSetting-editField-boolean:test:setting" disabled={false} - label="On" + label={ + + } onChange={[Function]} onKeyDown={[Function]} /> @@ -736,7 +754,13 @@ exports[`Field for boolean setting should render user value if there is user val checked={false} data-test-subj="advancedSetting-editField-boolean:test:setting" disabled={false} - label="Off" + label={ + + } onChange={[Function]} onKeyDown={[Function]} /> diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js index 54b72c0d2fec..6724fe59c514 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/components/field/field.js @@ -354,7 +354,17 @@ class FieldUI extends PureComponent { case 'boolean': return ( + ) : ( + + )} checked={!!unsavedValue} onChange={this.onFieldChange} disabled={loading || isOverridden} diff --git a/src/legacy/core_plugins/kibana/public/management/sections/settings/index.js b/src/legacy/core_plugins/kibana/public/management/sections/settings/index.js index 60ccaf50d2c4..764ae7532f60 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/settings/index.js +++ b/src/legacy/core_plugins/kibana/public/management/sections/settings/index.js @@ -85,11 +85,15 @@ management.getSection('kibana').register('settings', { url: '#/management/kibana/settings' }); -FeatureCatalogueRegistryProvider.register(() => { +FeatureCatalogueRegistryProvider.register(i18n => { return { id: 'advanced_settings', - title: 'Advanced Settings', - description: 'Directly edit settings that control behavior in Kibana.', + title: i18n('kbn.management.settings.advancedSettingsLabel', { + defaultMessage: 'Advanced Settings', + }), + description: i18n('kbn.management.settings.advancedSettingsDescription', { + defaultMessage: 'Directly edit settings that control behavior in Kibana.', + }), icon: 'advancedSettingsApp', path: '/app/kibana#/management/kibana/settings', showOnHomePage: false,