From 1f59e20c904cbc7ebf0945858951b57170d5e4fd Mon Sep 17 00:00:00 2001 From: Nox911 Date: Thu, 15 Nov 2018 15:50:55 +0300 Subject: [PATCH] Feature/translate monitoring access denied (#24985) * Translate monitoring - access_denied * Translate monitoring - lib, services * Translate monitoring - common * Fix issues * Fix issue --- x-pack/plugins/monitoring/common/constants.js | 12 ++-- .../public/lib/ajax_error_handler.js | 24 ++++++-- .../monitoring/public/lib/format_number.js | 3 +- .../monitoring/public/register_feature.js | 10 +++- .../public/services/breadcrumbs_provider.js | 59 +++++++++++++------ .../monitoring/public/services/title.js | 8 ++- .../public/views/access_denied/index.html | 38 +++++++----- 7 files changed, 108 insertions(+), 46 deletions(-) diff --git a/x-pack/plugins/monitoring/common/constants.js b/x-pack/plugins/monitoring/common/constants.js index 7bc8164130ad..852afe74c461 100644 --- a/x-pack/plugins/monitoring/common/constants.js +++ b/x-pack/plugins/monitoring/common/constants.js @@ -4,6 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ +import { i18n } from '@kbn/i18n'; + /** * Helper string to add as a tag in every logging call */ @@ -129,10 +131,12 @@ export const LOGSTASH = { } }; -export const DEFAULT_NO_DATA_MESSAGE = 'There are no records that match your query. Try changing the time range selection.'; -export const DEFAULT_NO_DATA_MESSAGE_WITH_FILTER = ( - 'There are no records that match your query with the filter [{{FILTER}}]. Try changing the filter or the time range selection.' -); +export const DEFAULT_NO_DATA_MESSAGE = i18n.translate('xpack.monitoring.defaultNoDataMessage', { + defaultMessage: 'There are no records that match your query. Try changing the time range selection.' }); +export const DEFAULT_NO_DATA_MESSAGE_WITH_FILTER = i18n.translate('xpack.monitoring.defaultNoDataWithFilterMessage', { + defaultMessage: + 'There are no records that match your query with the filter [{filter}]. Try changing the filter or the time range selection.', + values: { filter: '{{FILTER}}' } }); export const TABLE_ACTION_UPDATE_FILTER = 'UPDATE_FILTER'; export const TABLE_ACTION_RESET_PAGING = 'RESET_PAGING'; diff --git a/x-pack/plugins/monitoring/public/lib/ajax_error_handler.js b/x-pack/plugins/monitoring/public/lib/ajax_error_handler.js index 552dc49e6332..8bad9b922158 100644 --- a/x-pack/plugins/monitoring/public/lib/ajax_error_handler.js +++ b/x-pack/plugins/monitoring/public/lib/ajax_error_handler.js @@ -13,6 +13,7 @@ import { EuiSpacer, EuiText, } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; export function formatMonitoringError(err) { // TODO: We should stop using Boom for errors and instead write a custom handler to return richer error objects @@ -24,7 +25,11 @@ export function formatMonitoringError(err) { { err.data.message }

- HTTP { err.status } + ); @@ -43,7 +48,11 @@ export function ajaxErrorHandlersProvider($injector) { kbnUrl.redirect('access-denied'); } else if (err.status === 404 && !contains($window.location.hash, 'no-data')) { // pass through if this is a 404 and we're already on the no-data page toastNotifications.addDanger({ - title: 'Monitoring Request Failed', + title: ( + ), text: (
{ formatMonitoringError(err) } @@ -53,14 +62,21 @@ export function ajaxErrorHandlersProvider($injector) { color="danger" onClick={() => $window.location.reload()} > - Retry +
) }); } else { toastNotifications.addDanger({ - title: 'Monitoring Request Error', + title: ( + ), text: formatMonitoringError(err) }); } diff --git a/x-pack/plugins/monitoring/public/lib/format_number.js b/x-pack/plugins/monitoring/public/lib/format_number.js index 3ef93e9140cb..38638736e8cf 100644 --- a/x-pack/plugins/monitoring/public/lib/format_number.js +++ b/x-pack/plugins/monitoring/public/lib/format_number.js @@ -7,6 +7,7 @@ import moment from 'moment'; import 'moment-duration-format'; import numeral from '@elastic/numeral'; +import { i18n } from '@kbn/i18n'; export function formatBytesUsage(used, max) { return formatNumber(used, 'byte') + ' / ' + formatNumber(max, 'byte'); @@ -61,5 +62,5 @@ export function formatMetric(value, format, suffix, options = {}) { } return formatNumber(value, format) + _suffix; } - return 'N/A'; + return i18n.translate('xpack.monitoring.formatNumbers.notAvailableLabel', { defaultMessage: 'N/A' }); } diff --git a/x-pack/plugins/monitoring/public/register_feature.js b/x-pack/plugins/monitoring/public/register_feature.js index ccfd85f9f67b..bef65ec24486 100644 --- a/x-pack/plugins/monitoring/public/register_feature.js +++ b/x-pack/plugins/monitoring/public/register_feature.js @@ -10,11 +10,15 @@ import chrome from 'ui/chrome'; import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; if (chrome.getInjected('monitoringUiEnabled')) { - FeatureCatalogueRegistryProvider.register(() => { + FeatureCatalogueRegistryProvider.register((i18n) => { return { id: 'monitoring', - title: 'Monitoring', - description: 'Track the real-time health and performance of your Elastic Stack.', + title: i18n('xpack.monitoring.monitoringTitle', { + defaultMessage: 'Monitoring' + }), + description: i18n('xpack.monitoring.monitoringDescription', { + defaultMessage: 'Track the real-time health and performance of your Elastic Stack.' + }), icon: 'monitoringApp', path: '/app/monitoring', showOnHomePage: true, diff --git a/x-pack/plugins/monitoring/public/services/breadcrumbs_provider.js b/x-pack/plugins/monitoring/public/services/breadcrumbs_provider.js index fbc7f596a7af..1b1cff5652af 100644 --- a/x-pack/plugins/monitoring/public/services/breadcrumbs_provider.js +++ b/x-pack/plugins/monitoring/public/services/breadcrumbs_provider.js @@ -5,6 +5,7 @@ */ import { set as setBreadcrumbs } from 'ui/chrome/services/breadcrumb_state'; +import { i18n } from '@kbn/i18n'; // Helper for making objects to use in a link element const createCrumb = (url, label, testSubj) => { @@ -21,14 +22,20 @@ function getElasticsearchBreadcrumbs(mainInstance) { if (mainInstance.instance) { breadcrumbs.push(createCrumb('#/elasticsearch', 'Elasticsearch')); if (mainInstance.name === 'indices') { - breadcrumbs.push(createCrumb('#/elasticsearch/indices', 'Indices', 'breadcrumbEsIndices')); + breadcrumbs.push(createCrumb('#/elasticsearch/indices', i18n.translate( + 'xpack.monitoring.breadcrumbs.es.indicesLabel', { defaultMessage: 'Indices' }), 'breadcrumbEsIndices')); } else if (mainInstance.name === 'nodes') { - breadcrumbs.push(createCrumb('#/elasticsearch/nodes', 'Nodes', 'breadcrumbEsNodes')); + breadcrumbs.push(createCrumb('#/elasticsearch/nodes', i18n.translate( + 'xpack.monitoring.breadcrumbs.es.nodesLabel', { defaultMessage: 'Nodes' }), 'breadcrumbEsNodes')); } else if (mainInstance.name === 'ml') { // ML Instance (for user later) - breadcrumbs.push(createCrumb('#/elasticsearch/ml_jobs', 'Jobs')); + breadcrumbs.push(createCrumb('#/elasticsearch/ml_jobs', i18n.translate( + 'xpack.monitoring.breadcrumbs.es.jobsLabel', { defaultMessage: 'Jobs' }) + )); } else if (mainInstance.name === 'ccr_shard') { - breadcrumbs.push(createCrumb('#/elasticsearch/ccr', 'CCR')); + breadcrumbs.push(createCrumb('#/elasticsearch/ccr', i18n.translate( + 'xpack.monitoring.breadcrumbs.es.ccrLabel', { defaultMessage: 'CCR' }) + )); } breadcrumbs.push(createCrumb(null, mainInstance.instance)); } else { @@ -43,7 +50,9 @@ function getKibanaBreadcrumbs(mainInstance) { const breadcrumbs = []; if (mainInstance.instance) { breadcrumbs.push(createCrumb('#/kibana', 'Kibana')); - breadcrumbs.push(createCrumb('#/kibana/instances', 'Instances')); + breadcrumbs.push(createCrumb('#/kibana/instances', i18n.translate( + 'xpack.monitoring.breadcrumbs.kibana.instancesLabel', { defaultMessage: 'Instances' }) + )); } else { // don't link to Overview when we're possibly on Overview or its sibling tabs breadcrumbs.push(createCrumb(null, 'Kibana')); @@ -53,19 +62,24 @@ function getKibanaBreadcrumbs(mainInstance) { // generate Logstash breadcrumbs function getLogstashBreadcrumbs(mainInstance) { + const logstashLabel = i18n.translate('xpack.monitoring.breadcrumbs.logstashLabel', { defaultMessage: 'Logstash' }); const breadcrumbs = []; if (mainInstance.instance) { - breadcrumbs.push(createCrumb('#/logstash', 'Logstash')); + breadcrumbs.push(createCrumb('#/logstash', logstashLabel)); if (mainInstance.name === 'nodes') { - breadcrumbs.push(createCrumb('#/logstash/nodes', 'Nodes')); + breadcrumbs.push(createCrumb('#/logstash/nodes', i18n.translate( + 'xpack.monitoring.breadcrumbs.logstash.nodesLabel', { defaultMessage: 'Nodes' }) + )); } breadcrumbs.push(createCrumb(null, mainInstance.instance)); } else if (mainInstance.page === 'pipeline') { - breadcrumbs.push(createCrumb('#/logstash', 'Logstash')); - breadcrumbs.push(createCrumb('#/logstash/pipelines', 'Pipelines')); + breadcrumbs.push(createCrumb('#/logstash', logstashLabel)); + breadcrumbs.push(createCrumb('#/logstash/pipelines', i18n.translate( + 'xpack.monitoring.breadcrumbs.logstash.pipelinesLabel', { defaultMessage: 'Pipelines' }) + )); } else { // don't link to Overview when we're possibly on Overview or its sibling tabs - breadcrumbs.push(createCrumb(null, 'Logstash')); + breadcrumbs.push(createCrumb(null, logstashLabel)); } return breadcrumbs; @@ -73,13 +87,16 @@ function getLogstashBreadcrumbs(mainInstance) { // generate Beats breadcrumbs function getBeatsBreadcrumbs(mainInstance) { + const beatsLabel = i18n.translate('xpack.monitoring.breadcrumbs.beatsLabel', { defaultMessage: 'Beats' }); const breadcrumbs = []; if (mainInstance.instance) { - breadcrumbs.push(createCrumb('#/beats', 'Beats')); - breadcrumbs.push(createCrumb('#/beats/beats', 'Instances')); + breadcrumbs.push(createCrumb('#/beats', beatsLabel)); + breadcrumbs.push(createCrumb('#/beats/beats', i18n.translate( + 'xpack.monitoring.breadcrumbs.beats.instancesLabel', { defaultMessage: 'Instances' }) + )); breadcrumbs.push(createCrumb(null, mainInstance.instance)); } else { - breadcrumbs.push(createCrumb(null, 'Beats')); + breadcrumbs.push(createCrumb(null, beatsLabel)); } return breadcrumbs; @@ -87,20 +104,28 @@ function getBeatsBreadcrumbs(mainInstance) { // generate Apm breadcrumbs function getApmBreadcrumbs(mainInstance) { + const apmLabel = i18n.translate('xpack.monitoring.breadcrumbs.apmLabel', { defaultMessage: 'APM' }); const breadcrumbs = []; if (mainInstance.instance) { - breadcrumbs.push(createCrumb('#/apm', 'APM')); - breadcrumbs.push(createCrumb('#/apm/instances', 'Instances')); + breadcrumbs.push(createCrumb('#/apm', apmLabel)); + breadcrumbs.push(createCrumb('#/apm/instances', i18n.translate( + 'xpack.monitoring.breadcrumbs.apm.instancesLabel', { defaultMessage: 'Instances' }) + )); } else { // don't link to Overview when we're possibly on Overview or its sibling tabs - breadcrumbs.push(createCrumb(null, 'APM')); + breadcrumbs.push(createCrumb(null, apmLabel)); } return breadcrumbs; } export function breadcrumbsProvider() { return function createBreadcrumbs(clusterName, mainInstance) { - let breadcrumbs = [ createCrumb('#/home', 'Clusters', 'breadcrumbClusters') ]; + let breadcrumbs = [ createCrumb('#/home', + i18n.translate( + 'xpack.monitoring.breadcrumbs.clustersLabel', { defaultMessage: 'Clusters' } + ), + 'breadcrumbClusters') + ]; if (!mainInstance.inOverview && clusterName) { breadcrumbs.push(createCrumb('#/overview', clusterName)); diff --git a/x-pack/plugins/monitoring/public/services/title.js b/x-pack/plugins/monitoring/public/services/title.js index fad5914f1117..21e994ce970a 100644 --- a/x-pack/plugins/monitoring/public/services/title.js +++ b/x-pack/plugins/monitoring/public/services/title.js @@ -9,12 +9,16 @@ import { uiModules } from 'ui/modules'; import { DocTitleProvider } from 'ui/doc_title'; const uiModule = uiModules.get('monitoring/title', []); -uiModule.service('title', (Private) => { +uiModule.service('title', (Private, i18n) => { const docTitle = Private(DocTitleProvider); return function changeTitle(cluster, suffix) { let clusterName = _.get(cluster, 'cluster_name'); clusterName = (clusterName) ? `- ${clusterName}` : ''; suffix = (suffix) ? `- ${suffix}` : ''; - docTitle.change(`Monitoring ${clusterName} ${suffix}`, true); + docTitle.change( + i18n('xpack.monitoring.monitoringDocTitle', { + defaultMessage: 'Monitoring {clusterName} {suffix}', + values: { clusterName, suffix } + }), true); }; }); diff --git a/x-pack/plugins/monitoring/public/views/access_denied/index.html b/x-pack/plugins/monitoring/public/views/access_denied/index.html index 5f0f0813ff56..8c67451b86f3 100644 --- a/x-pack/plugins/monitoring/public/views/access_denied/index.html +++ b/x-pack/plugins/monitoring/public/views/access_denied/index.html @@ -2,32 +2,40 @@
- - Access Denied - +
-
- You are not authorized to access Monitoring. To use Monitoring, you - need the privileges granted by both the `kibana_user` and - `monitoring_user` roles. -
+
-
- If you are attempting to access a dedicated monitoring cluster, this +
+ i18n-id="xpack.monitoring.accessDenied.backToKibanaButtonLabel" + i18n-default-message="Back to Kibana" + >