Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Restore previously removed translation keys for custom events across multiple languages, ensuring consistency in user experience and enhancing internationalization support.

Bill Yang8407e8860475
diff --git a/client/messages/de.json b/client/messages/de.json
index 0bd2055c3..c11ff22c4 100644
--- a/client/messages/de.json
+++ b/client/messages/de.json
@@ -194,8 +194,8 @@
"Zx7WPP": "Alle Event-Reihen ausgeblendet",
"AKRVhS": "Klicken Sie auf ein Legendenelement, um es anzuzeigen",
"NuhCPH": "Erfahren Sie, wie Sie Events verfolgen",
- "/aq5/F": "Keine benutzerdefinierten Events gefunden",
"ES6IYH": "Versuchen Sie einen anderen Zeitraum oder Filter",
+ "/aq5/F": "Keine benutzerdefinierten Events gefunden",
"j7BiRg": "Kein Event ausgewählt.",
"kF9XUo": "Zeitstempel",
"EwRIOm": "Benutzer",
diff --git a/client/messages/en.json b/client/messages/en.json
index 9fcca4320..a8a0de114 100644
--- a/client/messages/en.json
+++ b/client/messages/en.json
@@ -194,8 +194,8 @@
"Zx7WPP": "All event series hidden",
"AKRVhS": "Click a legend item to show it",
"NuhCPH": "Learn how to track events",
- "/aq5/F": "No custom events found",
"ES6IYH": "Try a different date range or filter",
+ "/aq5/F": "No custom events found",
"j7BiRg": "No event selected.",
"kF9XUo": "Timestamp",
"EwRIOm": "User",
diff --git a/client/messages/es.json b/client/messages/es.json
index 98993cd55..26c130033 100644
--- a/client/messages/es.json
+++ b/client/messages/es.json
@@ -194,8 +194,8 @@
"Zx7WPP": "Todas las series de eventos ocultas",
"AKRVhS": "Haz clic en un elemento de la leyenda para mostrarlo",
"NuhCPH": "Aprende cómo rastrear eventos",
- "/aq5/F": "No se encontraron eventos personalizados",
"ES6IYH": "Prueba un rango de fechas o filtro diferente",
+ "/aq5/F": "No se encontraron eventos personalizados",
"j7BiRg": "Ningún evento seleccionado.",
"kF9XUo": "Marca de tiempo",
"EwRIOm": "Usuario",
diff --git a/client/messages/fr.json b/client/messages/fr.json
index 55990b084..57ab97b93 100644
--- a/client/messages/fr.json
+++ b/client/messages/fr.json
@@ -194,8 +194,8 @@
"Zx7WPP": "Toutes les séries d'événements masquées",
"AKRVhS": "Cliquez sur un élément de la légende pour l'afficher",
"NuhCPH": "Apprenez à suivre les événements",
- "/aq5/F": "Aucun événement personnalisé trouvé",
"ES6IYH": "Essayez une autre période ou un autre filtre",
+ "/aq5/F": "Aucun événement personnalisé trouvé",
"j7BiRg": "Aucun événement sélectionné.",
"kF9XUo": "Horodatage",
"EwRIOm": "Utilisateur",
diff --git a/client/messages/it.json b/client/messages/it.json
index a08f8f7b7..e413fef8b 100644
--- a/client/messages/it.json
+++ b/client/messages/it.json
@@ -194,8 +194,8 @@
"Zx7WPP": "Tutte le serie di eventi nascoste",
"AKRVhS": "Clicca un elemento della legenda per mostrarlo",
"NuhCPH": "Scopri come tracciare gli eventi",
- "/aq5/F": "Nessun evento personalizzato trovato",
"ES6IYH": "Prova un intervallo di date diverso o un filtro",
+ "/aq5/F": "Nessun evento personalizzato trovato",
"j7BiRg": "Nessun evento selezionato.",
"kF9XUo": "Timestamp",
"EwRIOm": "Utente",
diff --git a/client/messages/ja.json b/client/messages/ja.json
index 61dc944ee..866573888 100644
--- a/client/messages/ja.json
+++ b/client/messages/ja.json
@@ -194,8 +194,8 @@
"Zx7WPP": "すべてのイベント系列が非表示です",
"AKRVhS": "凡例の項目をクリックして表示します",
"NuhCPH": "イベントのトラッキング方法を学ぶ",
- "/aq5/F": "カスタムイベントが見つかりません",
"ES6IYH": "別の日付範囲またはフィルターをお試しください",
+ "/aq5/F": "カスタムイベントが見つかりません",
"j7BiRg": "イベントが選択されていません。",
"kF9XUo": "タイムスタンプ",
"EwRIOm": "ユーザー",
diff --git a/client/messages/ko.json b/client/messages/ko.json
index e0fbecfbf..5cf7d5dfd 100644
--- a/client/messages/ko.json
+++ b/client/messages/ko.json
@@ -194,8 +194,8 @@
"Zx7WPP": "모든 이벤트 시리즈 숨김",
"AKRVhS": "범례 항목을 클릭하여 표시",
"NuhCPH": "이벤트 추적 방법 알아보기",
- "/aq5/F": "사용자 정의 이벤트를 찾을 수 없음",
"ES6IYH": "다른 날짜 범위 또는 필터를 시도하세요",
+ "/aq5/F": "사용자 정의 이벤트를 찾을 수 없음",
"j7BiRg": "이벤트가 선택되지 않았습니다.",
"kF9XUo": "타임스탬프",
"EwRIOm": "사용자",
diff --git a/client/messages/pl.json b/client/messages/pl.json
index d5396ab69..e59c2d5b3 100644
--- a/client/messages/pl.json
+++ b/client/messages/pl.json
@@ -194,8 +194,8 @@
"Zx7WPP": "Wszystkie serie zdarzeń ukryte",
"AKRVhS": "Kliknij element legendy, aby go wyświetlić",
"NuhCPH": "Dowiedz się, jak śledzić zdarzenia",
- "/aq5/F": "Nie znaleziono niestandardowych zdarzeń",
"ES6IYH": "Spróbuj innego zakresu dat lub filtra",
+ "/aq5/F": "Nie znaleziono niestandardowych zdarzeń",
"j7BiRg": "Nie wybrano zdarzenia.",
"kF9XUo": "Znacznik czasu",
"EwRIOm": "Użytkownik",
diff --git a/client/messages/pt.json b/client/messages/pt.json
index e1ecb0c83..4e96c3cde 100644
--- a/client/messages/pt.json
+++ b/client/messages/pt.json
@@ -194,8 +194,8 @@
"Zx7WPP": "Todas as séries de eventos ocultas",
"AKRVhS": "Clique em um item da legenda para exibi-lo",
"NuhCPH": "Saiba como rastrear eventos",
- "/aq5/F": "Nenhum evento personalizado encontrado",
"ES6IYH": "Tente um intervalo de datas diferente ou filtro",
+ "/aq5/F": "Nenhum evento personalizado encontrado",
"j7BiRg": "Nenhum evento selecionado.",
"kF9XUo": "Data/Hora",
"EwRIOm": "Usuário",
diff --git a/client/messages/zh.json b/client/messages/zh.json
index 312fe0232..0cc826506 100644
--- a/client/messages/zh.json
+++ b/client/messages/zh.json
@@ -194,8 +194,8 @@
"Zx7WPP": "所有事件系列已隐藏",
"AKRVhS": "点击图例项以显示它",
"NuhCPH": "了解如何追踪事件",
- "/aq5/F": "未找到自定义事件",
"ES6IYH": "尝试不同的日期范围或过滤器",
+ "/aq5/F": "未找到自定义事件",
"j7BiRg": "未选择事件。",
"kF9XUo": "时间戳",
"EwRIOm": "用户",
diff --git a/client/src/app/[site]/api-playground/components/TimezoneSelect.tsx b/client/src/app/[site]/api-playground/components/TimezoneSelect.tsx
index 6d14d7cd5..d8ce7e972 100644
--- a/client/src/app/[site]/api-playground/components/TimezoneSelect.tsx
+++ b/client/src/app/[site]/api-playground/components/TimezoneSelect.tsx
@@ -2,7 +2,8 @@
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { useExtracted } from "next-intl";
-import { commonTimezones, usePlaygroundStore } from "../hooks/usePlaygroundStore";
+import { usePlaygroundStore } from "../hooks/usePlaygroundStore";
+import { timezones } from "@/lib/dateTimeUtils";
export function TimezoneSelect() {
const t = useExtracted();
@@ -16,7 +17,7 @@ export function TimezoneSelect() {
<SelectValue placeholder={t("Select timezone")} />
</SelectTrigger>
<SelectContent>
- {commonTimezones.map(tz => (
+ {timezones.map(tz => (
<SelectItem key={tz.value} value={tz.value} className="text-xs">
{tz.label}
</SelectItem>
diff --git a/client/src/app/[site]/api-playground/hooks/usePlaygroundStore.ts b/client/src/app/[site]/api-playground/hooks/usePlaygroundStore.ts
index 54907b0b8..98738c7c0 100644
--- a/client/src/app/[site]/api-playground/hooks/usePlaygroundStore.ts
+++ b/client/src/app/[site]/api-playground/hooks/usePlaygroundStore.ts
@@ -211,6 +211,3 @@ export const filterOperators = [
{ value: "not_contains", label: "Not Contains" },
{ value: "regex", label: "Regex" },
];
-
-// Re-export timezones from shared location for backwards compatibility
-export { timezones as commonTimezones } from "@/lib/dateTimeUtils";
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineClusterUtils.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineClusterUtils.ts
index 41a2dddaf..11d84cc85 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineClusterUtils.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineClusterUtils.ts
@@ -1,7 +1,7 @@
-import mapboxgl from "mapbox-gl";
import { isNil, round } from "lodash";
import type { GetSessionsResponse } from "../../../../../../api/analytics/endpoints";
-import { SOURCE_ID, MIN_CLUSTER_SIZE } from "./timelineLayerConstants";
+import { MIN_CLUSTER_SIZE } from "../../../utils/clusteringConstants";
+import { SOURCE_ID } from "./timelineLayerConstants";
import { spreadOverlappingPoints } from "./timelineLayerManager";
/**
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerConstants.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerConstants.ts
index 9652848bb..76f337829 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerConstants.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerConstants.ts
@@ -1,14 +1,3 @@
-import {
- CLUSTER_MAX_ZOOM,
- MIN_CLUSTER_SIZE,
- CLUSTERING_THRESHOLD,
- SPREAD_START_ZOOM,
- SPREAD_RADIUS_DEGREES,
-} from "../../../utils/clusteringConstants";
-
-// Re-export shared constants
-export { CLUSTER_MAX_ZOOM, MIN_CLUSTER_SIZE, CLUSTERING_THRESHOLD, SPREAD_START_ZOOM, SPREAD_RADIUS_DEGREES };
-
// Mapbox layer and source IDs
export const SOURCE_ID = "timeline-sessions";
export const CLUSTER_LAYER_ID = "timeline-clusters";
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerManager.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerManager.ts
index f5d9052b8..a52770236 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerManager.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerManager.ts
@@ -1,7 +1,7 @@
-import mapboxgl from "mapbox-gl";
import { isNil, round } from "lodash";
import type { GetSessionsResponse } from "../../../../../../api/analytics/endpoints";
-import { CLUSTER_LAYER_ID, CLUSTER_COUNT_LAYER_ID, SOURCE_ID, SPREAD_RADIUS_DEGREES } from "./timelineLayerConstants";
+import { SPREAD_RADIUS_DEGREES } from "../../../utils/clusteringConstants";
+import { CLUSTER_COUNT_LAYER_ID, CLUSTER_LAYER_ID, SOURCE_ID } from "./timelineLayerConstants";
/**
* Simple hash function to generate pseudo-random numbers from a string
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerSetup.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerSetup.ts
index cdb3faa41..d6b3b038e 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerSetup.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/timelineLayerSetup.ts
@@ -4,8 +4,8 @@ import {
CLUSTER_LAYER_ID,
CLUSTER_COUNT_LAYER_ID,
UNCLUSTERED_LAYER_ID,
- MIN_CLUSTER_SIZE,
} from "./timelineLayerConstants";
+import { MIN_CLUSTER_SIZE } from "../../../utils/clusteringConstants";
/**
* Create and configure the popup for session tooltips
diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineLayer.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineLayer.ts
index 4fd49c454..b5f137eff 100644
--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineLayer.ts
+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineLayer.ts
@@ -1,25 +1,22 @@
-import mapboxgl from "mapbox-gl";
-import { useEffect, useRef, useState, useCallback } from "react";
import { throttle } from "lodash";
+import { useEffect, useRef, useState } from "react";
import type { GetSessionsResponse } from "../../../../../../api/analytics/endpoints";
-import { useTimelineStore, useActiveSessions } from "../../../timelineStore";
+import { useActiveSessions, useTimelineStore } from "../../../timelineStore";
import { initializeClusterSource, setupClusterClickHandler } from "./timelineClusterUtils";
import {
- SOURCE_ID,
CLUSTER_LAYER_ID,
- CLUSTER_MAX_ZOOM,
CLUSTER_RADIUS,
- CLUSTERING_THRESHOLD,
- SPREAD_START_ZOOM,
+ SOURCE_ID,
} from "./timelineLayerConstants";
import { setClusterLayersVisibility, updateGeoJSONData } from "./timelineLayerManager";
-import { updateMarkers as updateMarkersUtil, clearAllMarkers, type MarkerData } from "./timelineMarkerManager";
import {
- createTooltipPopup,
addClusterLayers,
+ createTooltipPopup,
disableClusterTransitions,
setupClusterHoverHandlers,
} from "./timelineLayerSetup";
+import { clearAllMarkers, updateMarkers as updateMarkersUtil, type MarkerData } from "./timelineMarkerManager";
+import { CLUSTER_MAX_ZOOM, CLUSTERING_THRESHOLD, SPREAD_START_ZOOM } from "../../../utils/clusteringConstants";
export function useTimelineLayer({
map,
diff --git a/client/src/lib/geo.ts b/client/src/lib/geo.ts
index 2ffe468c2..baa2579e2 100644
--- a/client/src/lib/geo.ts
+++ b/client/src/lib/geo.ts
@@ -1,8 +1,5 @@
import { useGeoStore, getSubdivisions, getCountries } from "./geoStore";
-// Re-export types for backward compatibility
-export type { Subdivisions, Country } from "./geoStore";
-
// Hook-based access (for components that need reactive updates)
export const useSubdivisions = () => {
const { subdivisions, isLoadingSubdivisions: isLoading, subdivisionsError: error } = useGeoStore();