From c2b681276a2a1616e91f8afa7fc6fb01d7e6e776 Mon Sep 17 00:00:00 2001 From: tibmt Date: Tue, 20 Nov 2018 17:09:55 +0300 Subject: [PATCH] Discover translations (#24079) * translate discover plugin * update discover translation PR * Update fetch_error.js * Update unit tests * Fix eslint * use separate span tag for label * use separate tags for translated labels * resolve review comments * Update snapshot * fix issue with bucket aria-label * fix quotes * Update snapshot * fix quotes * update snapshots --- .../components/fetch_error/fetch_error.js | 26 ++- .../field_chooser/discover_field.html | 2 +- .../field_chooser/discover_field.js | 23 ++- .../field_chooser/field_chooser.html | 72 +++++--- .../components/field_chooser/field_chooser.js | 12 +- .../lib/detail_views/string.html | 35 +++- .../field_chooser/lib/field_calculator.js | 19 ++- .../public/discover/controllers/discover.js | 111 +++++++++--- .../controllers/get_painless_error.ts | 6 +- .../__snapshots__/no_results.test.js.snap | 8 +- .../public/discover/directives/index.js | 5 +- .../public/discover/directives/no_results.js | 158 ++++++++++++++---- .../discover/directives/no_results.test.js | 16 +- .../directives/unsupported_index_pattern.js | 13 +- .../kibana/public/discover/index.html | 50 ++++-- .../kibana/public/discover/index.js | 10 +- .../discover/saved_searches/_saved_search.js | 6 +- .../open_search_panel.test.js.snap | 20 ++- .../discover/top_nav/open_search_panel.js | 20 ++- .../top_nav/show_open_search_panel.js | 11 +- 20 files changed, 481 insertions(+), 142 deletions(-) diff --git a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js index 745693178d966..52dd71325a2a0 100644 --- a/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js +++ b/src/core_plugins/kibana/public/discover/components/fetch_error/fetch_error.js @@ -21,6 +21,7 @@ import 'ngreact'; import React, { Fragment } from 'react'; import { uiModules } from 'ui/modules'; import chrome from 'ui/chrome'; +import { FormattedMessage, injectI18nProvider } from '@kbn/i18n/react'; import { EuiFlexGroup, @@ -43,9 +44,26 @@ const DiscoverFetchError = ({ fetchError }) => { body = (

- You can address this error by editing the ‘{fetchError.script}’ field - in Management > Index Patterns, - under the “Scripted fields” tab. + , + managementLink: ( + + + + ) + }} + />

); } @@ -77,4 +95,4 @@ const DiscoverFetchError = ({ fetchError }) => { const app = uiModules.get('apps/discover', ['react']); -app.directive('discoverFetchError', reactDirective => reactDirective(DiscoverFetchError)); +app.directive('discoverFetchError', reactDirective => reactDirective(injectI18nProvider(DiscoverFetchError))); diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html index 76d7bec8e454c..206239f6ae3c4 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.html @@ -17,7 +17,7 @@ ng-if="field.name !== '_source'" ng-click="toggleDisplay(field)" ng-class="::field.display ? 'kuiButton--danger' : 'kuiButton--primary'" - ng-bind="::field.display ? 'remove' : 'add'" + ng-bind="::addRemoveButtonLabel" class="dscSidebarItem__action kuiButton kuiButton--small" data-test-subj="fieldToggle-{{::field.name}}" > diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js index 4627dfbdcf9e8..8ff6e3a5751f6 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/discover_field.js @@ -26,7 +26,7 @@ import detailsHtml from './lib/detail_views/string.html'; import { uiModules } from 'ui/modules'; const app = uiModules.get('apps/discover'); -app.directive('discoverField', function ($compile) { +app.directive('discoverField', function ($compile, i18n) { return { restrict: 'E', template: html, @@ -42,11 +42,18 @@ app.directive('discoverField', function ($compile) { let detailsElem; let detailScope; - const init = function () { if ($scope.field.details) { $scope.toggleDetails($scope.field, true); } + + $scope.addRemoveButtonLabel = $scope.field.display + ? i18n('kbn.discover.fieldChooser.discoverField.removeButtonLabel', { + defaultMessage: 'remove', + }) + : i18n('kbn.discover.fieldChooser.discoverField.addButtonLabel', { + defaultMessage: 'add', + }); }; const getWarnings = function (field) { @@ -92,6 +99,18 @@ app.directive('discoverField', function ($compile) { $scope.onShowDetails(field, recompute); detailScope = $scope.$new(); detailScope.warnings = getWarnings(field); + detailScope.getBucketAriaLabel = (bucket) => { + return i18n('kbn.discover.fieldChooser.discoverField.bucketAriaLabel', { + defaultMessage: 'Value: {value}', + values: { + value: bucket.display === '' + ? i18n('kbn.discover.fieldChooser.discoverField.emptyStringText', { + defaultMessage: 'Empty string', + }) + : bucket.display, + }, + }); + }; detailsElem = $(detailsHtml); $compile(detailsElem)(detailScope); diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html index 2e64db6656bca..73442a4ec74b8 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.html @@ -1,4 +1,4 @@ -
+
- +
- +
+ i18n-id="kbn.discover.fieldChooser.filter.resetFiltersButtonLabel" + i18n-default-message="Reset filters" + >
@@ -149,7 +168,10 @@
- Index ‘B’ + Index ‘B’ - , shard ‘2’ + , shard ‘2’
reactDirective(DiscoverNoResults)); +app.directive('discoverNoResults', reactDirective => reactDirective(injectI18nProvider(DiscoverNoResults))); app.directive( 'discoverUnsupportedIndexPattern', - reactDirective => reactDirective(DiscoverUnsupportedIndexPattern, ['unsupportedType']) + reactDirective => reactDirective(injectI18nProvider(DiscoverUnsupportedIndexPattern), ['unsupportedType']) ); diff --git a/src/core_plugins/kibana/public/discover/directives/no_results.js b/src/core_plugins/kibana/public/discover/directives/no_results.js index 3c12ad0645e6d..4427658a2792f 100644 --- a/src/core_plugins/kibana/public/discover/directives/no_results.js +++ b/src/core_plugins/kibana/public/discover/directives/no_results.js @@ -18,6 +18,7 @@ */ import React, { Component, Fragment } from 'react'; +import { FormattedMessage } from '@kbn/i18n/react'; import PropTypes from 'prop-types'; import { @@ -61,7 +62,24 @@ export class DiscoverNoResults extends Component { const failures = shardFailures.map((failure, index) => (
- Index ‘{failure.index}’, shard ‘{failure.shard}’ + + + + ), + failureShard: `‘${failure.shard}’`, + }} + /> @@ -80,11 +98,17 @@ export class DiscoverNoResults extends Component {

- Address shard failures +

- The following shard failures occurred: +

{failures} @@ -102,21 +126,33 @@ export class DiscoverNoResults extends Component {

- Expand your time range +

- One or more of the indices you’re looking at contains a date field. Your query may - not match anything in the current time range, or there may not be any data at all in - the currently selected time range. You can try {( - - opening the time picker - - )} and changing the time range to one which contains data. + + + + ) + }} + />

@@ -129,19 +165,64 @@ export class DiscoverNoResults extends Component { if (queryLanguage === 'lucene') { const searchExamples = [{ description: 200, - title: Find requests that contain the number 200, in any field, + title: ( + + + + + + ), }, { description: status:200, - title: Find 200 in the status field, + title: ( + + + + + + ), }, { description: status:[400 TO 499], - title: Find all status codes between 400-499, + title: ( + + + + + + ), }, { description: status:[400 TO 499] AND extension:PHP, - title: Find status codes 400-499 with the extension php, + title: ( + + + + + + ), }, { description: status:[400 TO 499] AND (extension:php OR extension:html), - title: Find status codes 400-499 with the extension php or html, + title: ( + + + + + + ), }]; luceneQueryMessage = ( @@ -150,19 +231,31 @@ export class DiscoverNoResults extends Component {

- Refine your query +

- The search bar at the top uses Elasticsearch’s support for Lucene {( - - Query String syntax - - )}. Here are some examples of how you can search for web server logs that have been - parsed into a few fields. + + + + ) + }} + />

@@ -185,7 +278,10 @@ export class DiscoverNoResults extends Component { } color="warning" iconType="help" data-test-subj="discoverNoResults" diff --git a/src/core_plugins/kibana/public/discover/directives/no_results.test.js b/src/core_plugins/kibana/public/discover/directives/no_results.test.js index f4d72a321324e..1aeb66ceccc91 100644 --- a/src/core_plugins/kibana/public/discover/directives/no_results.test.js +++ b/src/core_plugins/kibana/public/discover/directives/no_results.test.js @@ -18,7 +18,7 @@ */ import React from 'react'; -import { render, mount } from 'enzyme'; +import { renderWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers'; import sinon from 'sinon'; import { findTestSubject } from '@elastic/eui/lib/test'; @@ -40,7 +40,7 @@ describe('DiscoverNoResults', () => { reason: { reason: 'Bad error' }, }]; - const component = render( + const component = renderWithIntl( { test(`doesn't render failures list when there are no failures`, () => { const shardFailures = []; - const component = render( + const component = renderWithIntl( { describe('isTimePickerOpen', () => { test('false is reflected in the aria-expanded state of the button', () => { - const component = render( + const component = renderWithIntl( { }); test('true is reflected in the aria-expanded state of the button', () => { - const component = render( + const component = renderWithIntl( { describe('timeFieldName', () => { test('renders time range feedback', () => { - const component = render( + const component = renderWithIntl( { describe('queryLanguage', () => { test('supports lucene and renders doc link', () => { - const component = render( + const component = renderWithIntl( { describe('topNavToggle', () => { test('is called whe time picker button is clicked', () => { const topNavToggleSpy = sinon.stub(); - const component = mount( + const component = mountWithIntl( { // This message makes the assumption that X-Pack will support this type, as is the case with // rollup index patterns. - const message = `Index patterns based on ${unsupportedType} indices require the` + - ` ${unsupportedType} plugin from X-Pack, which is not installed or disabled`; + const message = ( + + ); return ( diff --git a/src/core_plugins/kibana/public/discover/index.html b/src/core_plugins/kibana/public/discover/index.html index 4735b852a96e0..a267544bdffcb 100644 --- a/src/core_plugins/kibana/public/discover/index.html +++ b/src/core_plugins/kibana/public/discover/index.html @@ -10,15 +10,19 @@

  {{(hits || 0) | number:0}} - +

@@ -87,7 +91,10 @@

class="dscOverlay" >
-

Searching

+

{{fetchStatus.complete}}/{{fetchStatus.total}}
@@ -102,7 +109,10 @@

Searching

> - Skip to bottom + @@ -127,7 +137,13 @@

Searching

content="getBucketIntervalToolTipText()" position="'top'" > - Scaled to {{ bucketInterval.description }} +
@@ -163,10 +179,24 @@

Searching

-
- These are the first {{opts.sampleSize}} documents matching - your search, refine your search to see others. - Back to top. +
+ +
diff --git a/src/core_plugins/kibana/public/discover/index.js b/src/core_plugins/kibana/public/discover/index.js index d1a0bb1c9f1e6..68685a9d5b28b 100644 --- a/src/core_plugins/kibana/public/discover/index.js +++ b/src/core_plugins/kibana/public/discover/index.js @@ -25,11 +25,15 @@ import './controllers/discover'; import 'ui/doc_table/components/table_row'; import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; -FeatureCatalogueRegistryProvider.register(() => { +FeatureCatalogueRegistryProvider.register(i18n => { return { id: 'discover', - title: 'Discover', - description: 'Interactively explore your data by querying and filtering raw documents.', + title: i18n('kbn.discover.discoverTitle', { + defaultMessage: 'Discover', + }), + description: i18n('kbn.discover.discoverDescription', { + defaultMessage: 'Interactively explore your data by querying and filtering raw documents.', + }), icon: 'discoverApp', path: '/app/kibana#/discover', showOnHomePage: true, diff --git a/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js b/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js index 5a15c5a08c6be..89df75c753520 100644 --- a/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js +++ b/src/core_plugins/kibana/public/discover/saved_searches/_saved_search.js @@ -27,7 +27,7 @@ const module = uiModules.get('discover/saved_searches', [ 'kibana/courier' ]); -module.factory('SavedSearch', function (Private) { +module.factory('SavedSearch', function (Private, i18n) { const SavedObject = Private(SavedObjectProvider); createLegacyClass(SavedSearch).inherits(SavedObject); function SavedSearch(id) { @@ -38,7 +38,9 @@ module.factory('SavedSearch', function (Private) { id: id, defaults: { - title: 'New Saved Search', + title: i18n('kbn.discover.savedSearch.newSavedSearchTitle', { + defaultMessage: 'New Saved Search', + }), description: '', columns: [], hits: 0, diff --git a/src/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap b/src/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap index 4ddf453c5a819..05b8fae9ab1dd 100644 --- a/src/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap +++ b/src/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap @@ -16,7 +16,11 @@ exports[`render 1`] = ` textTransform="none" >

- Open Search +

- Manage searches + } makeUrl={[Function]} - noItemsMessage="No matching searches found." + noItemsMessage={ + + } onChoose={[Function]} savedObjectType="search" /> diff --git a/src/core_plugins/kibana/public/discover/top_nav/open_search_panel.js b/src/core_plugins/kibana/public/discover/top_nav/open_search_panel.js index f06dcf5d9c3d6..1235272588fcb 100644 --- a/src/core_plugins/kibana/public/discover/top_nav/open_search_panel.js +++ b/src/core_plugins/kibana/public/discover/top_nav/open_search_panel.js @@ -21,6 +21,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder'; import rison from 'rison-node'; +import { FormattedMessage } from '@kbn/i18n/react'; import { EuiSpacer, @@ -40,7 +41,10 @@ export class OpenSearchPanel extends React.Component { onClick={this.props.onClose} href={`#/management/kibana/objects?_a=${rison.encode({ tab: SEARCH_OBJECT_TYPE })}`} > - Manage searches + ); } @@ -55,13 +59,23 @@ export class OpenSearchPanel extends React.Component { -

Open Search

+

+ +

+ } savedObjectType={SEARCH_OBJECT_TYPE} makeUrl={this.props.makeUrl} onChoose={this.props.onClose} diff --git a/src/core_plugins/kibana/public/discover/top_nav/show_open_search_panel.js b/src/core_plugins/kibana/public/discover/top_nav/show_open_search_panel.js index 5b76f9ebc6652..febfd55514910 100644 --- a/src/core_plugins/kibana/public/discover/top_nav/show_open_search_panel.js +++ b/src/core_plugins/kibana/public/discover/top_nav/show_open_search_panel.js @@ -20,6 +20,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { OpenSearchPanel } from './open_search_panel'; +import { I18nProvider } from '@kbn/i18n/react'; let isOpen = false; @@ -38,10 +39,12 @@ export function showOpenSearchPanel({ makeUrl }) { document.body.appendChild(container); const element = ( - + + + ); ReactDOM.render(element, container); }