resolved conflicts

fix locales
resolved conflicts
2025-03-07 11:59:02 +01:00 · 2025-03-07 11:58:28 +01:00 · 2025-03-07 11:48:25 +01:00 · 2025-03-07 11:46:14 +01:00 · 2025-03-07 11:17:34 +01:00 · 2025-03-07 11:13:38 +01:00
6 changed files with 18 additions and 8 deletions
--- a/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetSessions/WidgetSessions.tsx
@ -217,7 +217,7 @@ function WidgetSessions(props: Props) {
        <div>
          <div className="flex items-baseline gap-2">
            <h2 className="text-xl">
-              {metricStore.clickMapSearch ? 'Clicks' : 'Sessions'}
+              {metricStore.clickMapSearch ? t('Clicks') : t('Sessions')}
            </h2>
            <div className="ml-2 color-gray-medium">
              {metricStore.clickMapLabel
@ -233,7 +233,7 @@ function WidgetSessions(props: Props) {
              </span>{' '}
            </div>
            {hasFilters && (
-              <Tooltip title="Clear Drilldown" placement="top">
+              <Tooltip title={t('Clear Drilldown')} placement="top">
                <Button type="text" size="small" onClick={clearFilters}>
                  <UndoOutlined />
                </Button>
@ -270,7 +270,7 @@ function WidgetSessions(props: Props) {
              >
                <Button type="text" size="small">
                  {seriesOptions.find((option) => option.value === activeSeries)
-                    ?.label || 'Select Series'}
+                    ?.label || t('Select Series')}
                  <DownOutlined />
                </Button>
              </Dropdown>
--- a/frontend/app/locales/en.json
+++ b/frontend/app/locales/en.json
@ -1443,5 +1443,7 @@
  "Dashboard": "Dashboard",
  "Assist (Live)": "Assist (Live)",
  "Assist (Call)": "Assist (Call)",
-  "Change Spot Visibility": "Change Spot Visibility"
+  "Change Spot Visibility": "Change Spot Visibility",
+  "Clear Drilldown": "Clear Drilldown",
+  "Select Series": "Select Series"
 }
--- a/frontend/app/locales/es.json
+++ b/frontend/app/locales/es.json
@ -1443,5 +1443,7 @@
  "Dashboard": "Panel de control",
  "Assist (Live)": "Asistencia (En vivo)",
  "Assist (Call)": "Asistencia (Llamada)",
-  "Change Spot Visibility": "Cambiar visibilidad de Spot"
+  "Change Spot Visibility": "Cambiar visibilidad de Spot",
+  "Clear Drilldown": "Limpiar desglose",
+  "Select Series": "Seleccionar Serie"
 }
--- a/frontend/app/locales/fr.json
+++ b/frontend/app/locales/fr.json
@ -1443,5 +1443,7 @@
  "Dashboard": "Tableau de bord",
  "Assist (Live)": "Assistance (En direct)",
  "Assist (Call)": "Assistance (Appel)",
-  "Change Spot Visibility": "Modifier la visibilité du Spot"
+  "Change Spot Visibility": "Modifier la visibilité du Spot",
+  "Clear Drilldown": "Effacer le forage",
+  "Select Series": "Sélectionner la série"
 }
--- a/frontend/app/locales/ru.json
+++ b/frontend/app/locales/ru.json
@ -1443,5 +1443,7 @@
  "Dashboard": "Дашборд",
  "Assist (Live)": "Assist (Live)",
  "Assist (Call)": "Assist (Call)",
-  "Change Spot Visibility": "Изменить видимость Spot"
+  "Change Spot Visibility": "Изменить видимость Spot",
+  "Clear Drilldown": "Очистить детализацию",
+  "Select Series": "Выбрать серию"
 }
--- a/frontend/app/locales/zh.json
+++ b/frontend/app/locales/zh.json
@ -1443,5 +1443,7 @@
  "Dashboard": "仪表板",
  "Assist (Live)": "Assist（实时协助）",
  "Assist (Call)": "Assist（通话协助）",
-  "Change Spot Visibility": "更改 Spot 可见性"
+  "Change Spot Visibility": "更改 Spot 可见性",
+  "Clear Drilldown": "清除下钻",
+  "Select Series": "选择系列"
 }
Author	SHA1	Message	Date
Андрей Бабушкин	7b8a41a163	resolved conflicts	2025-03-07 11:59:02 +01:00
Андрей Бабушкин	6dd3df7531	fix locales	2025-03-07 11:58:28 +01:00
Андрей Бабушкин	a2490eb78a	resolved conflicts	2025-03-07 11:48:25 +01:00
Андрей Бабушкин	536d79a4d5	add locales	2025-03-07 11:46:14 +01:00
Андрей Бабушкин	759cf80011	fix error	2025-03-07 11:17:34 +01:00
Андрей Бабушкин	c678c7b876	fix errors	2025-03-07 11:13:38 +01:00
Андрей Бабушкин	87a7912f24	pulled dev	2025-03-07 10:42:20 +01:00
Андрей Бабушкин	7714d561d2	fix errors	2025-03-07 10:41:48 +01:00
Андрей Бабушкин	4d2877fb7c	pulled dev	2025-03-06 18:17:16 +01:00
Андрей Бабушкин	6c3d032c19	fix erorrs	2025-03-06 18:09:01 +01:00
Андрей Бабушкин	47ad8499e8	fix conflicts	2025-03-06 17:42:14 +01:00
Андрей Бабушкин	3b7cfade9f	fix locales	2025-03-06 15:30:19 +01:00
Андрей Бабушкин	393a1e8683	fix min files	2025-03-06 15:20:54 +01:00
Андрей Бабушкин	adfa1ac519	updated locales	2025-03-06 15:16:17 +01:00
Андрей Бабушкин	97d4c672a7	removed error boundary	2025-03-05 16:11:40 +01:00
Андрей Бабушкин	2b1a9f3378	add locales and lint the project	2025-03-05 16:09:18 +01:00
Андрей Бабушкин	aaaf9f07a4	resolved conflicts	2025-02-27 11:11:02 +01:00
Андрей Бабушкин	b822b1c067	applied eslint	2025-02-26 20:31:01 +01:00