From 3cedcdedbdc3cbabc346d13ef3d549a6d9bbb717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= Date: Tue, 15 Nov 2022 17:30:33 +0100 Subject: [PATCH] Internationalization: Translate VariableInput and VariableOptions components (#58748) --- .../variables/pickers/shared/VariableInput.tsx | 4 +++- .../variables/pickers/shared/VariableLink.tsx | 9 ++++++++- .../variables/pickers/shared/VariableOptions.tsx | 12 +++++++++--- public/locales/de-DE/grafana.json | 9 +++++++++ public/locales/en-US/grafana.json | 9 +++++++++ public/locales/es-ES/grafana.json | 9 +++++++++ public/locales/fr-FR/grafana.json | 9 +++++++++ public/locales/pseudo-LOCALE/grafana.json | 9 +++++++++ public/locales/zh-Hans/grafana.json | 9 +++++++++ 9 files changed, 74 insertions(+), 5 deletions(-) diff --git a/public/app/features/variables/pickers/shared/VariableInput.tsx b/public/app/features/variables/pickers/shared/VariableInput.tsx index 967015709db..8191121d92f 100644 --- a/public/app/features/variables/pickers/shared/VariableInput.tsx +++ b/public/app/features/variables/pickers/shared/VariableInput.tsx @@ -1,5 +1,7 @@ import React, { PureComponent } from 'react'; +import { t } from 'app/core/internationalization'; + import { NavigationKey } from '../types'; export interface Props extends Omit, 'onChange' | 'value'> { @@ -37,7 +39,7 @@ export class VariableInput extends PureComponent { value={value ?? ''} onChange={this.onChange} onKeyDown={this.onKeyDown} - placeholder="Enter variable value" + placeholder={t('variable.picker.input', 'Enter variable value')} /> ); } diff --git a/public/app/features/variables/pickers/shared/VariableLink.tsx b/public/app/features/variables/pickers/shared/VariableLink.tsx index e35546e4212..d20b2f0b302 100644 --- a/public/app/features/variables/pickers/shared/VariableLink.tsx +++ b/public/app/features/variables/pickers/shared/VariableLink.tsx @@ -4,6 +4,9 @@ import React, { FC, MouseEvent, useCallback } from 'react'; import { GrafanaTheme2 } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; import { Icon, Tooltip, useStyles2 } from '@grafana/ui'; +import { t } from 'app/core/internationalization'; + +import { ALL_VARIABLE_TEXT } from '../../constants'; interface Props { onClick: () => void; @@ -65,7 +68,11 @@ interface VariableLinkTextProps { const VariableLinkText: FC = ({ text }) => { const styles = useStyles2(getStyles); - return {text}; + return ( + + {text === ALL_VARIABLE_TEXT ? t('variable.picker.link-all', 'All') : text} + + ); }; const LoadingIndicator: FC> = ({ onCancel }) => { diff --git a/public/app/features/variables/pickers/shared/VariableOptions.tsx b/public/app/features/variables/pickers/shared/VariableOptions.tsx index 078abb753cf..ad538e2a408 100644 --- a/public/app/features/variables/pickers/shared/VariableOptions.tsx +++ b/public/app/features/variables/pickers/shared/VariableOptions.tsx @@ -4,7 +4,9 @@ import React, { PureComponent } from 'react'; import { selectors } from '@grafana/e2e-selectors'; import { Tooltip, Themeable2, withTheme2, clearButtonStyles } from '@grafana/ui'; +import { Trans, t } from 'app/core/internationalization'; +import { ALL_VARIABLE_VALUE } from '../../constants'; import { VariableOption } from '../../types'; export interface Props extends React.HTMLProps, Themeable2 { @@ -62,6 +64,8 @@ class VariableOptions extends PureComponent { const selectClass = option.selected ? 'variable-option pointer selected' : 'variable-option pointer'; const highlightClass = index === highlightIndex ? `${selectClass} highlighted` : selectClass; + const isAllOption = option.value === ALL_VARIABLE_VALUE; + return (
    • @@ -87,8 +91,10 @@ class VariableOptions extends PureComponent { return null; } + const tooltipContent = () => Clear selections; + return ( - + ); diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json index cada8dd06d3..f8d014b4763 100644 --- a/public/locales/de-DE/grafana.json +++ b/public/locales/de-DE/grafana.json @@ -492,5 +492,14 @@ }, "user-sessions": { "loading": "Sitzungen werden geladen …" + }, + "variable": { + "picker": { + "input": "", + "link-all": "", + "option-all": "", + "option-selected-values": "", + "option-tooltip": "" + } } } diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index afd9de68fa6..a2948102dec 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -492,5 +492,14 @@ }, "user-sessions": { "loading": "Loading sessions..." + }, + "variable": { + "picker": { + "input": "Enter variable value", + "link-all": "All", + "option-all": "All", + "option-selected-values": "Selected", + "option-tooltip": "Clear selections" + } } } diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json index d757a814bc4..279a0268ddb 100644 --- a/public/locales/es-ES/grafana.json +++ b/public/locales/es-ES/grafana.json @@ -492,5 +492,14 @@ }, "user-sessions": { "loading": "Cargando sesiones..." + }, + "variable": { + "picker": { + "input": "", + "link-all": "", + "option-all": "", + "option-selected-values": "", + "option-tooltip": "" + } } } diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json index 797aaeb31c2..293a6870412 100644 --- a/public/locales/fr-FR/grafana.json +++ b/public/locales/fr-FR/grafana.json @@ -492,5 +492,14 @@ }, "user-sessions": { "loading": "Chargement des sessions..." + }, + "variable": { + "picker": { + "input": "", + "link-all": "", + "option-all": "", + "option-selected-values": "", + "option-tooltip": "" + } } } diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json index de4478874a4..11149157a5c 100644 --- a/public/locales/pseudo-LOCALE/grafana.json +++ b/public/locales/pseudo-LOCALE/grafana.json @@ -492,5 +492,14 @@ }, "user-sessions": { "loading": "Ŀőäđįʼnģ şęşşįőʼnş..." + }, + "variable": { + "picker": { + "input": "Ēʼnŧęř väřįäþľę väľūę", + "link-all": "Åľľ", + "option-all": "Åľľ", + "option-selected-values": "Ŝęľęčŧęđ", + "option-tooltip": "Cľęäř şęľęčŧįőʼnş" + } } } diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json index cc4d4fd3512..8b6769c214d 100644 --- a/public/locales/zh-Hans/grafana.json +++ b/public/locales/zh-Hans/grafana.json @@ -492,5 +492,14 @@ }, "user-sessions": { "loading": "正在加载会话..." + }, + "variable": { + "picker": { + "input": "", + "link-all": "", + "option-all": "", + "option-selected-values": "", + "option-tooltip": "" + } } }