From c828ff49dbf7f4e8ef28adf832ab40bd495ea2db Mon Sep 17 00:00:00 2001 From: Marco Vettorello Date: Fri, 6 Oct 2023 11:21:41 +0200 Subject: [PATCH] [Lens] Fixes color mappings special tockens i18n (#168152) ## Summary fix https://github.com/elastic/kibana/issues/168151 To test: - create a cartesian charts with breakdowns that contains both the `Other` group and an `(empty)` value - apply a manual color mapping that use both these terms by select them from the combo-box, not by typing them. - Then change the Kibana language to a different one other than English and see if the color mapping applies correctly. --------- Co-authored-by: Stratoula Kalafateli --- .../color_mapping/color/rule_matching.ts | 15 +++++++++++++-- .../plugins/translations/translations/fr-FR.json | 2 ++ .../plugins/translations/translations/ja-JP.json | 2 ++ .../plugins/translations/translations/zh-CN.json | 2 ++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/packages/kbn-coloring/src/shared_components/color_mapping/color/rule_matching.ts b/packages/kbn-coloring/src/shared_components/color_mapping/color/rule_matching.ts index 7557644154a52..0d844ca26e27e 100644 --- a/packages/kbn-coloring/src/shared_components/color_mapping/color/rule_matching.ts +++ b/packages/kbn-coloring/src/shared_components/color_mapping/color/rule_matching.ts @@ -6,6 +6,7 @@ * Side Public License, v 1. */ +import { i18n } from '@kbn/i18n'; import { ColorMapping } from '../config'; export function ruleMatch( @@ -41,6 +42,16 @@ export function rangeMatch(rule: ColorMapping.RuleRange, value: number) { // TODO: move in some data/table related package export const SPECIAL_TOKENS_STRING_CONVERTION = new Map([ - ['__other__', 'Other'], - ['', '(empty)'], + [ + '__other__', + i18n.translate('coloring.colorMapping.terms.otherBucketLabel', { + defaultMessage: 'Other', + }), + ], + [ + '', + i18n.translate('coloring.colorMapping.terms.emptyLabel', { + defaultMessage: '(empty)', + }), + ], ]); diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index f3514ba7fbb65..c1f3af869cb78 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -229,6 +229,8 @@ "coloring.dynamicColoring.rangeType.label": "Type de valeur", "coloring.dynamicColoring.rangeType.number": "Numéro", "coloring.dynamicColoring.rangeType.percent": "Pourcent", + "coloring.colorMapping.terms.otherBucketLabel": "Autre", + "coloring.colorMapping.terms.emptyLabel": "(vide)", "console.helpPage.learnAboutConsoleAndQueryDslText": "En savoir plus sur {console} et {queryDsl}", "console.historyPage.itemOfRequestListAriaLabel": "Requête : {historyItem}", "console.settingsPage.refreshInterval.everyNMinutesTimeInterval": "Toutes les {value} {value, plural, one {minute} many {minutes} other {minutes}}", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index d078f535b6c99..18492c43f4216 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -229,6 +229,8 @@ "coloring.dynamicColoring.rangeType.label": "値型", "coloring.dynamicColoring.rangeType.number": "数字", "coloring.dynamicColoring.rangeType.percent": "割合（%）", + "coloring.colorMapping.terms.otherBucketLabel":"その他", + "coloring.colorMapping.terms.emptyLabel": "（空）", "console.helpPage.learnAboutConsoleAndQueryDslText": "{console}と{queryDsl}についてさらに詳しく", "console.historyPage.itemOfRequestListAriaLabel": "リクエスト：{historyItem}", "console.settingsPage.refreshInterval.everyNMinutesTimeInterval": "{value}{value, plural, other {分}}毎", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 3b8006085b1da..296b107b99e5c 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -229,6 +229,8 @@ "coloring.dynamicColoring.rangeType.label": "值类型", "coloring.dynamicColoring.rangeType.number": "数字", "coloring.dynamicColoring.rangeType.percent": "百分比", + "coloring.colorMapping.terms.otherBucketLabel":"其他", + "coloring.colorMapping.terms.emptyLabel": "（空）", "console.helpPage.learnAboutConsoleAndQueryDslText": "了解 {console} 和 {queryDsl}", "console.historyPage.itemOfRequestListAriaLabel": "请求：{historyItem}", "console.settingsPage.refreshInterval.everyNMinutesTimeInterval": "每 {value} {value, plural, other {分钟}}",