From c1d677c1743ee3d3fccd04d1f2081f7cd4eb9eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Fern=C3=A1ndez?= <laura.fernandez@grafana.com>
Date: Tue, 8 Nov 2022 14:55:50 +0100
Subject: [PATCH] Internationalization: Translate TimeRangeContent component
 (#58343)

---
 .../TimeRangePicker/TimeRangeContent.tsx      | 24 ++++++++++++-------
 public/locales/de-DE/grafana.json             |  8 +++++++
 public/locales/en-US/grafana.json             |  8 +++++++
 public/locales/es-ES/grafana.json             |  8 +++++++
 public/locales/fr-FR/grafana.json             |  8 +++++++
 public/locales/pseudo-LOCALE/grafana.json     |  8 +++++++
 public/locales/zh-Hans/grafana.json           |  8 +++++++
 7 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx
index 4018c7e49c6..c9cf01ce6a7 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeContent.tsx
@@ -17,6 +17,7 @@ import { selectors } from '@grafana/e2e-selectors';
 
 import { Icon, Tooltip } from '../..';
 import { useStyles2 } from '../../..';
+import { t, Trans } from '../../../utils/i18n';
 import { Button } from '../../Button';
 import { Field } from '../../Forms/Field';
 import { Input } from '../../Input/Input';
@@ -40,8 +41,8 @@ interface InputState {
 }
 
 const ERROR_MESSAGES = {
-  default: 'Please enter a past date or "now"',
-  range: '"From" can\'t be after "To"',
+  default: () => t('time-picker.range-content.default-error', 'Please enter a past date or "now"'),
+  range: () => t('time-picker.range-content.range-error', '"From" can\'t be after "To"'),
 };
 
 export const TimeRangeContent = (props: Props) => {
@@ -95,11 +96,14 @@ export const TimeRangeContent = (props: Props) => {
   };
 
   const fiscalYear = rangeUtil.convertRawToRange({ from: 'now/fy', to: 'now/fy' }, timeZone, fiscalYearStartMonth);
+  const fiscalYearMessage = t('time-picker.range-content.fiscal-year', 'Fiscal year');
 
   const fyTooltip = (
     <div className={style.tooltip}>
       {rangeUtil.isFiscal(value) ? (
-        <Tooltip content={`Fiscal year: ${fiscalYear.from.format('MMM-DD')} - ${fiscalYear.to.format('MMM-DD')}`}>
+        <Tooltip
+          content={`${fiscalYearMessage}: ${fiscalYear.from.format('MMM-DD')} - ${fiscalYear.to.format('MMM-DD')}`}
+        >
           <Icon name="info-circle" />
         </Tooltip>
       ) : null}
@@ -119,7 +123,11 @@ export const TimeRangeContent = (props: Props) => {
   return (
     <div>
       <div className={style.fieldContainer}>
-        <Field label="From" invalid={from.invalid} error={from.errorMessage}>
+        <Field
+          label={t('time-picker.range-content.from-input', 'From')}
+          invalid={from.invalid}
+          error={from.errorMessage}
+        >
           <Input
             onClick={(event) => event.stopPropagation()}
             onChange={(event) => onChange(event.currentTarget.value, to.value)}
@@ -132,7 +140,7 @@ export const TimeRangeContent = (props: Props) => {
         {fyTooltip}
       </div>
       <div className={style.fieldContainer}>
-        <Field label="To" invalid={to.invalid} error={to.errorMessage}>
+        <Field label={t('time-picker.range-content.to-input', 'To')} invalid={to.invalid} error={to.errorMessage}>
           <Input
             onClick={(event) => event.stopPropagation()}
             onChange={(event) => onChange(from.value, event.currentTarget.value)}
@@ -145,7 +153,7 @@ export const TimeRangeContent = (props: Props) => {
         {fyTooltip}
       </div>
       <Button data-testid={selectors.components.TimePicker.applyTimeRange} type="button" onClick={onApply}>
-        Apply time range
+        <Trans i18nKey="time-picker.range-content.apply-button">Apply time range</Trans>
       </Button>
 
       <TimePickerCalendar
@@ -187,9 +195,9 @@ function valueToState(
     {
       value: fromValue,
       invalid: fromInvalid || rangeInvalid,
-      errorMessage: rangeInvalid && !fromInvalid ? ERROR_MESSAGES.range : ERROR_MESSAGES.default,
+      errorMessage: rangeInvalid && !fromInvalid ? ERROR_MESSAGES.range() : ERROR_MESSAGES.default(),
     },
-    { value: toValue, invalid: toInvalid, errorMessage: ERROR_MESSAGES.default },
+    { value: toValue, invalid: toInvalid, errorMessage: ERROR_MESSAGES.default() },
   ];
 }
 
diff --git a/public/locales/de-DE/grafana.json b/public/locales/de-DE/grafana.json
index 56c51cddda1..1ca184b73ac 100644
--- a/public/locales/de-DE/grafana.json
+++ b/public/locales/de-DE/grafana.json
@@ -417,6 +417,14 @@
       "cancel-button": "",
       "select-time": ""
     },
+    "range-content": {
+      "apply-button": "",
+      "default-error": "",
+      "fiscal-year": "",
+      "from-input": "",
+      "range-error": "",
+      "to-input": ""
+    },
     "time-range": {
       "aria-role": "",
       "default-title": "",
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 40b777faea6..fa73634eaec 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -417,6 +417,14 @@
       "cancel-button": "Cancel",
       "select-time": "Select a time range"
     },
+    "range-content": {
+      "apply-button": "Apply time range",
+      "default-error": "Please enter a past date or \"now\"",
+      "fiscal-year": "Fiscal year",
+      "from-input": "From",
+      "range-error": "\"From\" can't be after \"To\"",
+      "to-input": "To"
+    },
     "time-range": {
       "aria-role": "Time range selection",
       "default-title": "Time ranges",
diff --git a/public/locales/es-ES/grafana.json b/public/locales/es-ES/grafana.json
index c4e399bd743..67b1f8720a8 100644
--- a/public/locales/es-ES/grafana.json
+++ b/public/locales/es-ES/grafana.json
@@ -417,6 +417,14 @@
       "cancel-button": "",
       "select-time": ""
     },
+    "range-content": {
+      "apply-button": "",
+      "default-error": "",
+      "fiscal-year": "",
+      "from-input": "",
+      "range-error": "",
+      "to-input": ""
+    },
     "time-range": {
       "aria-role": "",
       "default-title": "",
diff --git a/public/locales/fr-FR/grafana.json b/public/locales/fr-FR/grafana.json
index 2d8efa6ff75..403844b5bae 100644
--- a/public/locales/fr-FR/grafana.json
+++ b/public/locales/fr-FR/grafana.json
@@ -417,6 +417,14 @@
       "cancel-button": "",
       "select-time": ""
     },
+    "range-content": {
+      "apply-button": "",
+      "default-error": "",
+      "fiscal-year": "",
+      "from-input": "",
+      "range-error": "",
+      "to-input": ""
+    },
     "time-range": {
       "aria-role": "",
       "default-title": "",
diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json
index 6f66c3caba3..a2234c00f60 100644
--- a/public/locales/pseudo-LOCALE/grafana.json
+++ b/public/locales/pseudo-LOCALE/grafana.json
@@ -417,6 +417,14 @@
       "cancel-button": "Cäʼnčęľ",
       "select-time": "Ŝęľęčŧ ä ŧįmę řäʼnģę"
     },
+    "range-content": {
+      "apply-button": "Åppľy ŧįmę řäʼnģę",
+      "default-error": "Pľęäşę ęʼnŧęř ä päşŧ đäŧę őř \"ʼnőŵ\"",
+      "fiscal-year": "Fįşčäľ yęäř",
+      "from-input": "Fřőm",
+      "range-error": "\"Fřőm\" čäʼn'ŧ þę äƒŧęř \"Ŧő\"",
+      "to-input": "Ŧő"
+    },
     "time-range": {
       "aria-role": "Ŧįmę řäʼnģę şęľęčŧįőʼn",
       "default-title": "Ŧįmę řäʼnģęş",
diff --git a/public/locales/zh-Hans/grafana.json b/public/locales/zh-Hans/grafana.json
index 4666c5c50ec..a12e22c2c50 100644
--- a/public/locales/zh-Hans/grafana.json
+++ b/public/locales/zh-Hans/grafana.json
@@ -417,6 +417,14 @@
       "cancel-button": "",
       "select-time": ""
     },
+    "range-content": {
+      "apply-button": "",
+      "default-error": "",
+      "fiscal-year": "",
+      "from-input": "",
+      "range-error": "",
+      "to-input": ""
+    },
     "time-range": {
       "aria-role": "",
       "default-title": "",