diff --git a/src/ui/public/fancy_forms/kbn_form_controller.js b/src/ui/public/fancy_forms/kbn_form_controller.js index f376d8dfe3460..8d51b0712c6cd 100644 --- a/src/ui/public/fancy_forms/kbn_form_controller.js +++ b/src/ui/public/fancy_forms/kbn_form_controller.js @@ -17,7 +17,7 @@ * under the License. */ -export function decorateFormController($delegate, $injector) { +export function decorateFormController($delegate, $injector, i18n) { const [directive] = $delegate; const FormController = directive.controller; @@ -52,7 +52,11 @@ export function decorateFormController($delegate, $injector) { describeErrors() { const count = this.softErrorCount(); - return `${count} Error${count === 1 ? '' : 's'}`; + return i18n('common.ui.fancyForm.errorDescription', + { + defaultMessage: '{count, plural, one {# Error} other {# Errors}}', + values: { count } + }); } $setTouched() { diff --git a/src/ui/public/vis/agg_config.js b/src/ui/public/vis/agg_config.js index 881a3457905a8..6832d3d694fdc 100644 --- a/src/ui/public/vis/agg_config.js +++ b/src/ui/public/vis/agg_config.js @@ -26,6 +26,7 @@ import _ from 'lodash'; import { fieldFormats } from '../registry/field_formats'; +import { i18n } from '@kbn/i18n'; class AggConfig { @@ -265,8 +266,11 @@ class AggConfig { } if (!this.type) return ''; - let pre = percentageMode ? 'Percentage of ' : ''; - return pre += this.type.makeLabel(this); + return percentageMode ? + i18n.translate('common.ui.vis.aggConfig.percentageOfLabel', { + defaultMessage: 'Percentage of {label}', + values: { label: this.type.makeLabel(this) }, + }) : `${this.type.makeLabel(this)}`; } getIndexPattern() { diff --git a/src/ui/public/vis/default_feedback_message.js b/src/ui/public/vis/default_feedback_message.js index 90e309b161b28..f840ba961b9c3 100644 --- a/src/ui/public/vis/default_feedback_message.js +++ b/src/ui/public/vis/default_feedback_message.js @@ -17,5 +17,11 @@ * under the License. */ -export const defaultFeedbackMessage = `Have feedback? Please create an issue in -GitHub.`; +import { i18n } from '@kbn/i18n'; + +export const defaultFeedbackMessage = i18n.translate('common.ui.vis.defaultFeedbackMessage', + { + defaultMessage: 'Have feedback? Please create an issue in {link}.', + values: { link: 'GitHub' } + } +); diff --git a/src/ui/public/vis/editors/default/advanced_toggle.html b/src/ui/public/vis/editors/default/advanced_toggle.html index d5d7a7ea24057..cd4ca036906c5 100644 --- a/src/ui/public/vis/editors/default/advanced_toggle.html +++ b/src/ui/public/vis/editors/default/advanced_toggle.html @@ -1,6 +1,10 @@
- Advanced + +
diff --git a/src/ui/public/vis/editors/default/agg.html b/src/ui/public/vis/editors/default/agg.html index baba3554a9c3b..a303a19aeaab7 100644 --- a/src/ui/public/vis/editors/default/agg.html +++ b/src/ui/public/vis/editors/default/agg.html @@ -3,7 +3,7 @@ diff --git a/src/ui/public/vis/editors/default/agg_group.html b/src/ui/public/vis/editors/default/agg_group.html index a1718f72b351e..69320f91105e5 100644 --- a/src/ui/public/vis/editors/default/agg_group.html +++ b/src/ui/public/vis/editors/default/agg_group.html @@ -1,6 +1,6 @@
- {{ groupName }} + {{ groupNameLabel }}
diff --git a/src/ui/public/vis/editors/default/agg_group.js b/src/ui/public/vis/editors/default/agg_group.js index 5faac80495705..015a259f209c1 100644 --- a/src/ui/public/vis/editors/default/agg_group.js +++ b/src/ui/public/vis/editors/default/agg_group.js @@ -24,6 +24,7 @@ import './agg_add'; import { uiModules } from '../../../modules'; import aggGroupTemplate from './agg_group.html'; import { move } from '../../../utils/collection'; +import { aggGroupNameMaps } from './agg_group_names'; uiModules .get('app/visualize') @@ -35,6 +36,7 @@ uiModules scope: true, link: function ($scope, $el, attr) { $scope.groupName = attr.groupName; + $scope.groupNameLabel = aggGroupNameMaps()[$scope.groupName]; $scope.$bind('group', 'state.aggs.bySchemaGroup["' + $scope.groupName + '"]'); $scope.$bind('schemas', 'vis.type.schemas["' + $scope.groupName + '"]'); diff --git a/src/ui/public/vis/editors/default/agg_group_names.js b/src/ui/public/vis/editors/default/agg_group_names.js new file mode 100644 index 0000000000000..e67f0459ff764 --- /dev/null +++ b/src/ui/public/vis/editors/default/agg_group_names.js @@ -0,0 +1,25 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { i18n } from '@kbn/i18n'; + +export const aggGroupNameMaps = () => ({ + metrics: i18n.translate('common.ui.vis.editors.aggGroups.metricsText', { defaultMessage: 'metrics' }), + buckets: i18n.translate('common.ui.vis.editors.aggGroups.bucketsText', { defaultMessage: 'buckets' }) +}); diff --git a/src/ui/public/vis/editors/default/agg_params.html b/src/ui/public/vis/editors/default/agg_params.html index 1b809849d448b..28a2a3472faef 100644 --- a/src/ui/public/vis/editors/default/agg_params.html +++ b/src/ui/public/vis/editors/default/agg_params.html @@ -1,6 +1,9 @@
-

- "{{ agg.schema.title }}" aggs must run before all other buckets! +

{{ agg.schema.deprecateMessage }}

-

- "{{ agg.schema.title }}" has been deprecated. +

diff --git a/src/ui/public/vis/editors/default/agg_select.html b/src/ui/public/vis/editors/default/agg_select.html index 768c8626b5dc6..c8f3a1d0d690c 100644 --- a/src/ui/public/vis/editors/default/agg_select.html +++ b/src/ui/public/vis/editors/default/agg_select.html @@ -1,15 +1,29 @@
- - + + - {{agg.type.title}} help
@@ -20,7 +34,7 @@ data-test-subj="visEditorAggSelect" ng-model="agg.type" > - + {{$select.selected.title}} ︙
diff --git a/src/ui/public/vis/editors/default/default.js b/src/ui/public/vis/editors/default/default.js index 0564c25527adb..e1802960eb2a0 100644 --- a/src/ui/public/vis/editors/default/default.js +++ b/src/ui/public/vis/editors/default/default.js @@ -33,7 +33,7 @@ import { VisEditorTypesRegistryProvider } from '../../../registry/vis_editor_typ import { getVisualizeLoader } from '../../../visualize/loader/visualize_loader'; -const defaultEditor = function ($rootScope, $compile) { +const defaultEditor = function ($rootScope, $compile, i18n) { return class DefaultEditor { static key = 'default'; @@ -44,7 +44,11 @@ const defaultEditor = function ($rootScope, $compile) { if (!this.vis.type.editorConfig.optionTabs && this.vis.type.editorConfig.optionsTemplate) { this.vis.type.editorConfig.optionTabs = [ - { name: 'options', title: 'Options', editor: this.vis.type.editorConfig.optionsTemplate } + { + name: 'options', + title: i18n('common.ui.vis.editors.sidebar.tabs.optionsLabel', { defaultMessage: 'Options' }), + editor: this.vis.type.editorConfig.optionsTemplate, + } ]; } } diff --git a/src/ui/public/vis/editors/default/sidebar.html b/src/ui/public/vis/editors/default/sidebar.html index 9460225ff079d..5f92d4c1aa369 100644 --- a/src/ui/public/vis/editors/default/sidebar.html +++ b/src/ui/public/vis/editors/default/sidebar.html @@ -9,7 +9,13 @@
- Data @@ -78,7 +85,7 @@
    • - Auto Apply + +
  • diff --git a/src/ui/public/vis/map/kibana_map.js b/src/ui/public/vis/map/kibana_map.js index 77f059bee4e96..3c4f31f4bcda6 100644 --- a/src/ui/public/vis/map/kibana_map.js +++ b/src/ui/public/vis/map/kibana_map.js @@ -22,6 +22,7 @@ import L from 'leaflet'; import $ from 'jquery'; import _ from 'lodash'; import { zoomToPrecision } from '../../utils/zoom_to_precision'; +import { i18n } from '@kbn/i18n'; function makeFitControl(fitContainer, kibanaMap) { @@ -36,7 +37,9 @@ function makeFitControl(fitContainer, kibanaMap) { }, onAdd: function (leafletMap) { this._leafletMap = leafletMap; - $(this._fitContainer).html('') + const fitDatBoundsLabel = i18n.translate('common.ui.vis.kibanaMap.leaflet.fitDataBoundsAriaLabel', + { defaultMessage: 'Fit Data Bounds' }); + $(this._fitContainer).html(``) .on('click', e => { e.preventDefault(); this._kibanaMap.fitToData(); diff --git a/src/ui/public/vis/request_handlers/courier.js b/src/ui/public/vis/request_handlers/courier.js index 62494ce643855..2fb4b3d599b9e 100644 --- a/src/ui/public/vis/request_handlers/courier.js +++ b/src/ui/public/vis/request_handlers/courier.js @@ -26,6 +26,7 @@ import { tabifyAggResponse } from '../../agg_response/tabify/tabify'; import { FormattedData } from '../../inspector/adapters'; import { getTime } from '../../timefilter/get_time'; +import { i18n } from '@kbn/i18n'; const CourierRequestHandlerProvider = function () { @@ -124,9 +125,12 @@ const CourierRequestHandlerProvider = function () { if (shouldQuery) { const lastAggConfig = aggs; vis.API.inspectorAdapters.requests.reset(); - const request = vis.API.inspectorAdapters.requests.start('Data', { - description: `This request queries Elasticsearch to fetch the data for the visualization.`, - }); + const request = vis.API.inspectorAdapters.requests.start( + i18n.translate('common.ui.vis.courier.inspector.dataRequest.title', { defaultMessage: 'Data' }), + { + description: i18n.translate('common.ui.vis.courier.inspector.dataRequest.description', + { defaultMessage: 'This request queries Elasticsearch to fetch the data for the visualization.' }), + }); request.stats(getRequestInspectorStats(requestSearchSource)); const response = await requestSearchSource.fetch(); diff --git a/src/ui/public/vis/vis_category.js b/src/ui/public/vis/vis_category.js index c2074f5ae248d..1971c582d4128 100644 --- a/src/ui/public/vis/vis_category.js +++ b/src/ui/public/vis/vis_category.js @@ -23,6 +23,8 @@ * in the vis creation wizard. */ +import { i18n } from '@kbn/i18n'; + const CATEGORY = { BASIC: 'basic', DATA: 'data', @@ -35,12 +37,12 @@ const CATEGORY = { }; const CATEGORY_DISPLAY_NAMES = { - [CATEGORY.BASIC]: 'Basic Charts', - [CATEGORY.DATA]: 'Data', - [CATEGORY.GRAPHIC]: 'Graphic', - [CATEGORY.MAP]: 'Maps', - [CATEGORY.OTHER]: 'Other', - [CATEGORY.TIME]: 'Time Series' + [CATEGORY.BASIC]: i18n.translate('common.ui.vis.visCategory.basicChartsLabel', { defaultMessage: 'Basic Charts' }), + [CATEGORY.DATA]: i18n.translate('common.ui.vis.visCategory.dataLabel', { defaultMessage: 'Data' }), + [CATEGORY.GRAPHIC]: i18n.translate('common.ui.vis.visCategory.graphicLabel', { defaultMessage: 'Graphic' }), + [CATEGORY.MAP]: i18n.translate('common.ui.vis.visCategory.mapsLabel', { defaultMessage: 'Maps' }), + [CATEGORY.OTHER]: i18n.translate('common.ui.vis.visCategory.otherLabel', { defaultMessage: 'Other' }), + [CATEGORY.TIME]: i18n.translate('common.ui.vis.visCategory.timeSeriesLabel', { defaultMessage: 'Time Series' }) }; export { CATEGORY, CATEGORY_DISPLAY_NAMES }; diff --git a/src/ui/public/vis/vis_types/vislib_vis_legend.html b/src/ui/public/vis/vis_types/vislib_vis_legend.html index 9c8ac2c8c15c2..05a39f19974f9 100644 --- a/src/ui/public/vis/vis_types/vislib_vis_legend.html +++ b/src/ui/public/vis/vis_types/vislib_vis_legend.html @@ -3,7 +3,7 @@ type="button" ng-click="toggleLegend()" class="kuiCollapseButton legend-collapse-button" - aria-label="Toggle legend" + aria-label="{{::'common.ui.vis.visTypes.legend.toggleLegendButtonAriaLabel' | i18n: { defaultMessage: 'Toggle legend' } }}" aria-expanded="{{!!open}}" aria-controls="{{::legendId}}" > @@ -30,7 +30,7 @@ class="legend-value-title" tooltip="{{legendData.label}}" tooltip-animation="false" - aria-label="{{legendData.label}}, toggle options" + aria-label="{{::'common.ui.vis.visTypes.legend.toggleOptionsButtonAriaLabel' | i18n: { defaultMessage: '{legendDataLabel}, toggle options', values: { legendDataLabel: legendData.label } } }}" data-test-subj="legend-{{legendData.label}}" > @@ -57,7 +57,7 @@ @@ -67,8 +67,10 @@ - Set color for value {{legendData.label}}