Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

feat(sdk, embed-js): Add Content Translations for SDK InteractiveQuestion new query Editor (#68063)

Timofey Kachalov950b55555827
diff --git a/e2e/test-component/scenarios/embedding-sdk/content-translations-rerender-reproduction.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/content-translations-rerender-reproduction.cy.spec.tsx
new file mode 100644
index 00000000000..ae9f440d3e8
--- /dev/null
+++ b/e2e/test-component/scenarios/embedding-sdk/content-translations-rerender-reproduction.cy.spec.tsx
@@ -0,0 +1,69 @@
+import { InteractiveQuestion } from "@metabase/embedding-sdk-react";
+
+import { popover } from "e2e/support/helpers";
+import { uploadTranslationDictionaryViaAPI } from "e2e/support/helpers/e2e-content-translation-helpers";
+import { getSdkRoot } from "e2e/support/helpers/e2e-embedding-sdk-helpers";
+import { mountSdkContent } from "e2e/support/helpers/embedding-sdk-component-testing";
+import {
+ mockAuthProviderAndJwtSignIn,
+ signInAsAdminAndEnableEmbeddingSdk,
+} from "e2e/support/helpers/embedding-sdk-testing";
+import { Flex } from "metabase/ui";
+
+describe("scenarios > embedding-sdk > content-translations-rerender-reproduction", () => {
+ const setupEditor = () => {
+ signInAsAdminAndEnableEmbeddingSdk();
+
+ uploadTranslationDictionaryViaAPI([
+ // Table translations
+ { locale: "de", msgid: "Orders", msgstr: "Bestellungen" },
+ { locale: "de", msgid: "Products", msgstr: "Produkte" },
+ // Column translations
+ { locale: "de", msgid: "Total", msgstr: "Gesamtsumme" },
+ { locale: "de", msgid: "Tax", msgstr: "Steuer" },
+ { locale: "de", msgid: "Quantity", msgstr: "Menge" },
+ ]);
+
+ cy.signOut();
+ };
+
+ const mountEditor = () => {
+ mockAuthProviderAndJwtSignIn();
+
+ mountSdkContent(
+ <Flex p="xl">
+ <InteractiveQuestion questionId="new" />
+ </Flex>,
+ {
+ sdkProviderProps: {
+ locale: "de",
+ },
+ },
+ );
+
+ getSdkRoot().contains("Wähle deine Start-Daten");
+ };
+
+ it("should rerender content after a content-translation plugin is loaded", () => {
+ setupEditor();
+ mountEditor();
+
+ popover().within(() => {
+ // Use .should("exist") instead of .should("be.visible") because
+ // elements in scrollable popovers might be below the fold
+ cy.findByText("Produkte").should("exist");
+
+ cy.findByText("Bestellungen").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText("Füge Filter hinzu, um deine Antwort einzugrenzen").click();
+ });
+
+ popover().within(() => {
+ cy.findByText("Gesamtsumme").should("exist");
+ cy.findByText("Steuer").should("exist");
+ cy.findByText("Menge").should("exist");
+ });
+ });
+});
diff --git a/e2e/test-component/scenarios/embedding-sdk/content-translations.cy.spec.tsx b/e2e/test-component/scenarios/embedding-sdk/content-translations.cy.spec.tsx
index 2d919781bc1..e92b9bd0899 100644
--- a/e2e/test-component/scenarios/embedding-sdk/content-translations.cy.spec.tsx
+++ b/e2e/test-component/scenarios/embedding-sdk/content-translations.cy.spec.tsx
@@ -1,12 +1,18 @@
+import { InteractiveQuestion } from "@metabase/embedding-sdk-react";
+
import { SAMPLE_DATABASE } from "e2e/support/cypress_sample_database";
-import { createQuestion } from "e2e/support/helpers";
+import { createQuestion, popover } from "e2e/support/helpers";
import { uploadTranslationDictionaryViaAPI } from "e2e/support/helpers/e2e-content-translation-helpers";
import { getSdkRoot } from "e2e/support/helpers/e2e-embedding-sdk-helpers";
-import { mountInteractiveQuestion } from "e2e/support/helpers/embedding-sdk-component-testing";
+import {
+ mountInteractiveQuestion,
+ mountSdkContent,
+} from "e2e/support/helpers/embedding-sdk-component-testing";
import {
mockAuthProviderAndJwtSignIn,
signInAsAdminAndEnableEmbeddingSdk,
} from "e2e/support/helpers/embedding-sdk-testing";
+import { Flex } from "metabase/ui";
import type { Card } from "metabase-types/api";
const { ORDERS, ORDERS_ID } = SAMPLE_DATABASE;
@@ -75,4 +81,212 @@ describe("scenarios > embedding-sdk > content-translations", () => {
});
});
});
+
+ describe("editor", () => {
+ const setupEditor = () => {
+ signInAsAdminAndEnableEmbeddingSdk();
+
+ uploadTranslationDictionaryViaAPI([
+ // Table translations
+ { locale: "de", msgid: "Orders", msgstr: "Bestellungen" },
+ { locale: "de", msgid: "Products", msgstr: "Produkte" },
+ { locale: "de", msgid: "People", msgstr: "Personen" },
+ { locale: "de", msgid: "Reviews", msgstr: "Bewertungen" },
+ // Column translations
+ { locale: "de", msgid: "ID", msgstr: "Kennung" },
+ { locale: "de", msgid: "Total", msgstr: "Gesamtsumme" },
+ { locale: "de", msgid: "Tax", msgstr: "Steuer" },
+ { locale: "de", msgid: "Quantity", msgstr: "Menge" },
+ { locale: "de", msgid: "Discount", msgstr: "Rabatt" },
+ { locale: "de", msgid: "Created At", msgstr: "Erstellt am" },
+ { locale: "de", msgid: "Product ID", msgstr: "Produkt ID" },
+ { locale: "de", msgid: "User ID", msgstr: "Benutzer ID" },
+ { locale: "de", msgid: "Subtotal", msgstr: "Zwischensumme" },
+ { locale: "de", msgid: "Address", msgstr: "Adresse" },
+ ]);
+
+ cy.signOut();
+ };
+
+ const mountEditor = () => {
+ mockAuthProviderAndJwtSignIn();
+
+ mountSdkContent(
+ <Flex p="xl">
+ <InteractiveQuestion questionId="new" />
+ </Flex>,
+ {
+ sdkProviderProps: {
+ locale: "de",
+ },
+ },
+ );
+
+ getSdkRoot().contains("Wähle deine Start-Daten");
+ };
+
+ it("should translate content in pick data step", () => {
+ setupEditor();
+ mountEditor();
+
+ popover().within(() => {
+ // Use .should("exist") instead of .should("be.visible") because
+ // elements in scrollable popovers might be below the fold
+ cy.findByText("Produkte").should("exist");
+
+ cy.findByText("Bestellungen").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText(
+ "Füge Filter hinzu, um deine Antwort einzugrenzen",
+ ).click();
+ });
+
+ popover().within(() => {
+ cy.findByText("Gesamtsumme").should("exist");
+ cy.findByText("Steuer").should("exist");
+ cy.findByText("Menge").should("exist");
+ });
+ });
+
+ it("should translate content in filter step", () => {
+ setupEditor();
+ mountEditor();
+
+ popover().within(() => {
+ cy.findByText("Bestellungen").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText(
+ "Füge Filter hinzu, um deine Antwort einzugrenzen",
+ ).click();
+ });
+
+ popover().within(() => {
+ cy.findByText("Gesamtsumme").click();
+ });
+
+ popover().within(() => {
+ cy.findByTestId("number-filter-picker").within(() => {
+ cy.findByText("Gesamtsumme").should("be.visible");
+
+ cy.findByPlaceholderText("Min").type("100");
+ cy.findByPlaceholderText("Max").type("200");
+
+ cy.button("Füge einen Filter hinzu").click();
+ });
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText("Gesamtsumme ist zwischen 100 und 200").should(
+ "be.visible",
+ );
+ });
+ });
+
+ it("should translate content in aggregation and breakout step", () => {
+ setupEditor();
+ mountEditor();
+
+ popover().within(() => {
+ cy.findByText("Bestellungen").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText("Wähle eine Funktion oder Metrik aus").click();
+ });
+
+ popover().within(() => {
+ cy.findByText("Summe von...").click();
+
+ cy.findByText("Bestellungen").should("exist");
+ cy.findByText("Rabatt").should("exist");
+ });
+
+ popover().within(() => {
+ cy.findByText("Gesamtsumme").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText("Wähle eine Spalte für die Gruppierung").click();
+ });
+
+ popover().within(() => {
+ cy.findByText("Bestellungen").should("exist");
+ cy.findByText("Produkt ID").should("exist");
+
+ cy.findByText("Gesamtsumme").click();
+ });
+ });
+
+ it("should translate content in sort step", () => {
+ setupEditor();
+ mountEditor();
+
+ popover().within(() => {
+ cy.findByText("Bestellungen").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.button("Sortieren").click();
+ });
+
+ popover().within(() => {
+ cy.findByText("Benutzer ID").should("exist");
+
+ cy.findByText("Gesamtsumme").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText("Gesamtsumme").should("be.visible");
+ });
+ });
+
+ it("should translate content in join step", () => {
+ setupEditor();
+ mountEditor();
+
+ popover().within(() => {
+ cy.findByText("Bestellungen").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.button("Daten verknüpfen").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByLabelText("Linke Tabelle").should("have.text", "Bestellungen");
+ });
+
+ popover().within(() => {
+ cy.findByText("Personen").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText("Benutzer ID").click();
+ });
+
+ popover().within(() => {
+ cy.findByText("Bestellungen").should("exist");
+
+ cy.findByText("Produkt ID").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText("Kennung").click();
+ });
+
+ popover().within(() => {
+ cy.findByText("Personen").should("exist");
+ cy.findByText("Adresse").click();
+ });
+
+ getSdkRoot().within(() => {
+ cy.findByText("Produkt ID").should("be.visible");
+ cy.findByText("Adresse").should("be.visible");
+ });
+ });
+ });
});
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.tsx
index 56f4e5f5133..6e8a594340d 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabasePicker/DataSelectorDatabasePicker.tsx
@@ -6,6 +6,7 @@ import {
type Section,
} from "metabase/common/components/AccordionList";
import CS from "metabase/css/core/index.css";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Icon } from "metabase/ui";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
@@ -40,6 +41,7 @@ const DataSelectorDatabasePicker = ({
onBack,
hasInitialFocus,
}: DataSelectorDatabasePickerProps) => {
+ const tc = useTranslateContent();
const sections = useMemo(() => {
const sections: Section<Item>[] = [];
@@ -52,14 +54,14 @@ const DataSelectorDatabasePicker = ({
sections.push({
items: databases.map((database, index) => ({
- name: database.name,
+ name: tc(database.name),
index,
database,
})),
});
return sections;
- }, [databases, onBack]);
+ }, [databases, onBack, tc]);
const handleChangeSection = useCallback(
(_section: Section<Item>, sectionIndex: number) => {
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
index f9244f4eed6..36b74d32598 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
@@ -6,6 +6,7 @@ import {
type Section as BaseSection,
} from "metabase/common/components/AccordionList";
import CS from "metabase/css/core/index.css";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { isSyncCompleted } from "metabase/lib/syncing";
import { Icon } from "metabase/ui";
import type Database from "metabase-lib/v1/metadata/Database";
@@ -49,17 +50,19 @@ const DataSelectorDatabaseSchemaPicker = ({
onBack,
hasInitialFocus,
}: DataSelectorDatabaseSchemaPicker) => {
+ const tc = useTranslateContent();
+
if (databases.length === 0) {
return <DataSelectorLoading />;
}
const sections: Section[] = databases.map((database) => ({
- name: database.is_saved_questions ? t`Saved Questions` : database.name,
+ name: database.is_saved_questions ? t`Saved Questions` : tc(database.name),
items:
!database.is_saved_questions && database.getSchemas().length > 1
? database.getSchemas().map((schema) => ({
schema,
- name: schema.displayName() ?? "",
+ name: tc(schema.displayName()) ?? "",
}))
: [],
className: database.is_saved_questions ? CS.bgLight : undefined,
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
index ac48c249f8b..bc40c47018a 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
@@ -1,5 +1,6 @@
import { AccordionList } from "metabase/common/components/AccordionList";
import CS from "metabase/css/core/index.css";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Box, Icon } from "metabase/ui";
import type Schema from "metabase-lib/v1/metadata/Schema";
import type { SchemaId } from "metabase-types/api";
@@ -26,10 +27,11 @@ const DataSelectorSchemaPicker = ({
hasFiltering,
hasInitialFocus,
}: DataSelectorSchemaPickerProps) => {
+ const tc = useTranslateContent();
const sections = [
{
items: schemas.map((schema) => ({
- name: schema.displayName(),
+ name: tc(schema.displayName()),
schema: schema,
})),
},
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx
index 716411fd676..03c4372802a 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx
@@ -13,6 +13,7 @@ import {
} from "metabase/common/components/MetadataInfo/TableInfoIcon/TableInfoIcon";
import { useDocsUrl } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { isSyncCompleted } from "metabase/lib/syncing";
import { isNotNull } from "metabase/lib/types";
import { Box, DelayGroup, Flex, Icon, rem } from "metabase/ui";
@@ -63,6 +64,8 @@ const DataSelectorTablePicker = ({
minTablesToShowSearch = 10,
hasInitialFocus,
}: DataSelectorTablePickerProps) => {
+ const tc = useTranslateContent();
+
// In case DataSelector props get reset
if (!selectedDatabase) {
if (onBack) {
@@ -87,7 +90,7 @@ const DataSelectorTablePicker = ({
{
name: header,
items: tables.filter(isNotNull).map((table) => ({
- name: table.displayName(),
+ name: tc(table.displayName()),
table: table,
database: selectedDatabase,
})),
@@ -184,27 +187,31 @@ const Header = ({
schemas,
selectedDatabase,
selectedSchema,
-}: HeaderProps) => (
- <Flex align="center" wrap="wrap">
- <Flex align="center" style={{ cursor: "pointer" }} onClick={onBack}>
- {onBack && <Icon name="chevronleft" size={18} />}
- <Box component="span" ml="sm" data-testid="source-database">
- {selectedDatabase.name}
- </Box>
- </Flex>
+}: HeaderProps) => {
+ const tc = useTranslateContent();
- {selectedSchema?.name && schemas.length > 1 && (
- <>
- <Box component="span" mx="sm" c="text-secondary">
- /
- </Box>
- <Box component="span" data-testid="source-schema" c="text-secondary">
- {selectedSchema.displayName()}
+ return (
+ <Flex align="center" wrap="wrap">
+ <Flex align="center" style={{ cursor: "pointer" }} onClick={onBack}>
+ {onBack && <Icon name="chevronleft" size={18} />}
+ <Box component="span" ml="sm" data-testid="source-database">
+ {tc(selectedDatabase.name)}
</Box>
- </>
- )}
- </Flex>
-);
+ </Flex>
+
+ {selectedSchema?.name && schemas.length > 1 && (
+ <>
+ <Box component="span" mx="sm" c="text-secondary">
+ /
+ </Box>
+ <Box component="span" data-testid="source-schema" c="text-secondary">
+ {tc(selectedSchema.displayName())}
+ </Box>
+ </>
+ )}
+ </Flex>
+ );
+};
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default DataSelectorTablePicker;
diff --git a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx
index 9aded66ede3..b15dab3ff83 100644
--- a/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/SimpleDataPicker/SimpleDataPickerView.tsx
@@ -2,6 +2,7 @@ import { useState } from "react";
import { t } from "ttag";
import EmptyState from "metabase/common/components/EmptyState";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { CONTAINER_WIDTH } from "metabase/query_builder/components/DataSelector/constants";
import { Flex, Icon, NavLink, Paper, ScrollArea, TextInput } from "metabase/ui";
import type { TableId } from "metabase-types/api";
@@ -24,6 +25,7 @@ export function SimpleDataPickerView({
options,
onClick,
}: SimpleDataPickerProps) {
+ const tc = useTranslateContent();
const shouldShowSearchBar = options.length > 10;
const [searchText, setSearchText] = useState("");
function filterSearch(option: Options): boolean {
@@ -79,7 +81,7 @@ export function SimpleDataPickerView({
key={option.id}
active={selectedEntity === option.id}
leftSection={<Icon c={iconColor} name="table" aria-hidden />}
- label={option.name}
+ label={tc(option.name)}
onClick={() => onClick(option.id)}
variant="default"
/>
diff --git a/enterprise/frontend/src/embedding/data-picker/TriggerComponents.tsx b/enterprise/frontend/src/embedding/data-picker/TriggerComponents.tsx
index 526b8f13dd9..76958bce0b1 100644
--- a/enterprise/frontend/src/embedding/data-picker/TriggerComponents.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/TriggerComponents.tsx
@@ -4,6 +4,7 @@ import { t } from "ttag";
import _ from "underscore";
import CS from "metabase/css/core/index.css";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Box, Icon, Text } from "metabase/ui";
import type Database from "metabase-lib/v1/metadata/Database";
import type Field from "metabase-lib/v1/metadata/Field";
@@ -62,6 +63,7 @@ export function FieldTrigger({
database: Database;
field: Field;
}) {
+ const tc = useTranslateContent();
if (!field || !field.table) {
return <Text>{t`Select...`}</Text>;
}
@@ -71,21 +73,22 @@ export function FieldTrigger({
return (
<div>
<Box className={DataSelectorS.TextSchema}>
- {hasMultipleSchemas && field.table.schema_name + " > "}
- {field.table.display_name}
+ {hasMultipleSchemas && tc(field.table.schema_name) + " > "}
+ {tc(field.table.display_name)}
</Box>
- <Text lh="1.2rem">{field.display_name}</Text>
+ <Text lh="1.2rem">{tc(field.display_name)}</Text>
</div>
);
}
export function DatabaseTrigger({ database }: { database: Database }) {
+ const tc = useTranslateContent();
return database ? (
<span
className={cx(CS.textWrap, CS.noDecoration)}
data-testid="selected-database"
>
- {database.name}
+ {tc(database.name)}
</span>
) : (
<span
@@ -95,12 +98,13 @@ export function DatabaseTrigger({ database }: { database: Database }) {
}
export function TableTrigger({ table }: { table: Table }) {
+ const tc = useTranslateContent();
return table ? (
<span
className={cx(CS.textWrap, CS.noDecoration)}
data-testid="selected-table"
>
- {table.display_name || table.name}
+ {tc(table.display_name || table.name)}
</span>
) : (
<span
diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx
index 2d1cbc2a6c1..b7d456edaae 100644
--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityList.tsx
@@ -6,6 +6,7 @@ import EmptyState from "metabase/common/components/EmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import SelectList from "metabase/common/components/SelectList";
import { PERSONAL_COLLECTIONS } from "metabase/entities/collections/constants";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { PLUGIN_MODERATION } from "metabase/plugins";
import { Box } from "metabase/ui";
import { getQuestionVirtualTableId } from "metabase-lib/v1/metadata/utils/saved-questions";
@@ -30,6 +31,7 @@ const SavedEntityList = ({
collection,
onSelect,
}: SavedEntityListProps): JSX.Element => {
+ const tc = useTranslateContent();
const emptyState = (
<Box m="7.5rem 0">
<EmptyState message={t`Nothing here`} />
@@ -77,7 +79,7 @@ const SavedEntityList = ({
id={id}
isSelected={selectedId === virtualTableId}
size="small"
- name={name}
+ name={tc(name)}
icon={{
name: CARD_INFO[type].icon,
size: 16,
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/constants.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/constants.ts
index 69095715f97..2bdd0d32f11 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/constants.ts
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/constants.ts
@@ -4,3 +4,21 @@ export const contentTranslationEndpoints = {
uploadDictionary: "/api/ee/content-translation/upload-dictionary",
getCSV: "/api/ee/content-translation/csv",
};
+
+// Store for getDictionary endpoint with subscription support for React
+type Listener = () => void;
+const listeners = new Set<Listener>();
+
+export const dictionaryEndpointStore = {
+ getSnapshot: () => contentTranslationEndpoints.getDictionary,
+ subscribe: (listener: Listener) => {
+ listeners.add(listener);
+ return () => listeners.delete(listener);
+ },
+ setEndpoint: (endpoint: string | null) => {
+ if (contentTranslationEndpoints.getDictionary !== endpoint) {
+ contentTranslationEndpoints.getDictionary = endpoint;
+ listeners.forEach((listener) => listener());
+ }
+ },
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/index.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/index.ts
index cf13bf61a33..7397f291d1d 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/index.ts
@@ -2,9 +2,13 @@ import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
import { hasPremiumFeature } from "metabase-enterprise/settings";
import { ContentTranslationConfiguration } from "./components";
-import { contentTranslationEndpoints } from "./constants";
+import {
+ contentTranslationEndpoints,
+ dictionaryEndpointStore,
+} from "./constants";
import { useTranslateContent } from "./use-translate-content";
import {
+ getTranslatedFilterDisplayName,
translateDisplayNames,
useSortByContentTranslation,
useTranslateFieldValuesInHoveredObject,
@@ -30,16 +34,19 @@ export function initializePlugin() {
return;
}
- contentTranslationEndpoints.getDictionary = getDictionaryBasePath;
+ dictionaryEndpointStore.setEndpoint(getDictionaryBasePath);
},
setEndpointsForStaticEmbedding: (encodedToken: string) => {
if (contentTranslationEndpoints.getDictionary) {
return;
}
- contentTranslationEndpoints.getDictionary = `${getDictionaryBasePath}/${encodedToken}`;
+ dictionaryEndpointStore.setEndpoint(
+ `${getDictionaryBasePath}/${encodedToken}`,
+ );
},
translateDisplayNames,
+ getTranslatedFilterDisplayName,
ContentTranslationConfiguration,
});
}
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/use-translate-content.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/use-translate-content.ts
index 09f98c1da21..2788e2987fc 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/use-translate-content.ts
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/use-translate-content.ts
@@ -1,11 +1,11 @@
-import { useCallback } from "react";
+import { useCallback, useSyncExternalStore } from "react";
import { skipToken } from "metabase/api";
import { useLocale } from "metabase/common/hooks";
import type { ContentTranslationFunction } from "metabase/i18n/types";
import { useListContentTranslationsQuery } from "metabase-enterprise/api";
-import { contentTranslationEndpoints } from "./constants";
+import { dictionaryEndpointStore } from "./constants";
import { translateContentString } from "./utils";
/** When there are no translations, the content-translation function simply
@@ -35,8 +35,12 @@ export const useTranslateContent = (): ContentTranslationFunction => {
export const useListContentTranslations = () => {
const { locale } = useLocale();
+ const dictionaryEndpoint = useSyncExternalStore(
+ dictionaryEndpointStore.subscribe,
+ dictionaryEndpointStore.getSnapshot,
+ );
const { data } = useListContentTranslationsQuery(
- contentTranslationEndpoints.getDictionary
+ dictionaryEndpoint
? {
locale,
}
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/utils.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/utils.ts
index 1e1bcd9d3e1..0a6be073510 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/utils.ts
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/utils.ts
@@ -247,3 +247,33 @@ export const useSortByContentTranslation = () => {
[tc],
);
};
+
+/**
+ * Translates a filter's display name by translating the column name part.
+ * The longDisplayName is a pre-formatted string like "Plan is Business"
+ * where the column name part needs to be translated.
+ */
+export const getTranslatedFilterDisplayName = (
+ displayName: string,
+ tc: ContentTranslationFunction,
+ columnDisplayName?: string,
+): string => {
+ if (!displayName) {
+ return displayName ?? "";
+ }
+
+ if (!hasTranslations(tc)) {
+ return displayName;
+ }
+
+ if (columnDisplayName) {
+ const translatedColumnName = tc(columnDisplayName);
+
+ if (translatedColumnName !== columnDisplayName) {
+ return displayName.replace(columnDisplayName, translatedColumnName);
+ }
+ }
+
+ // Fallback to translate the whole string
+ return tc(displayName);
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.ts
index 7ff97318568..888228b67b0 100644
--- a/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.ts
@@ -10,7 +10,10 @@ import type {
import { createMockDatasetData } from "metabase-types/api/mocks";
import { leaveUntranslated } from "./use-translate-content";
-import { translateFieldValuesInSeries } from "./utils";
+import {
+ getTranslatedFilterDisplayName,
+ translateFieldValuesInSeries,
+} from "./utils";
registerVisualizations();
@@ -299,3 +302,85 @@ describe("translateFieldValuesInSeries", () => {
expect(result[0].data?.untranslatedRows).toEqual([]);
});
});
+
+describe("getTranslatedFilterDisplayName", () => {
+ const tcWithPlanTranslation: ContentTranslationFunction = (str) =>
+ str === "Plan" ? "My new name" : str;
+
+ const tcWithStatusTranslation: ContentTranslationFunction = (str) =>
+ str === "Status" ? "Estado" : str;
+
+ const tcWithPriceTranslation: ContentTranslationFunction = (str) =>
+ str === "Price" ? "Preis" : str;
+
+ it("should only replace the first occurrence of column name - 'Plan is Plan' becomes 'My new name is Plan'", () => {
+ const result = getTranslatedFilterDisplayName(
+ "Plan is Plan",
+ tcWithPlanTranslation,
+ "Plan",
+ );
+
+ expect(result).toBe("My new name is Plan");
+ });
+
+ it("should preserve the value when column name appears multiple times", () => {
+ const result = getTranslatedFilterDisplayName(
+ "Status is Status",
+ tcWithStatusTranslation,
+ "Status",
+ );
+
+ expect(result).toBe("Estado is Status");
+ });
+
+ it("should handle column name at the start of the string", () => {
+ const result = getTranslatedFilterDisplayName(
+ "Price is between 10 and 20",
+ tcWithPriceTranslation,
+ "Price",
+ );
+
+ expect(result).toBe("Preis is between 10 and 20");
+ });
+
+ it("should not replace anything if column name is not in display name", () => {
+ const tcWithQuantityTranslation: ContentTranslationFunction = (str) =>
+ str === "Quantity" ? "Menge" : str;
+
+ const result = getTranslatedFilterDisplayName(
+ "Total is greater than 100",
+ tcWithQuantityTranslation,
+ "Quantity",
+ );
+
+ expect(result).toBe("Total is greater than 100");
+ });
+
+ it("should return displayName unchanged when tc returns same value (no translations)", () => {
+ const result = getTranslatedFilterDisplayName(
+ "Total is greater than 100",
+ mockTranslateWithoutTranslations,
+ "Total",
+ );
+
+ expect(result).toBe("Total is greater than 100");
+ });
+
+ it("should return empty string when displayName is empty", () => {
+ const result = getTranslatedFilterDisplayName("", tcWithPlanTranslation);
+
+ expect(result).toBe("");
+ });
+
+ it("should fallback to translating the whole string when no columnDisplayName provided", () => {
+ const tcWithFullTranslation: ContentTranslationFunction = (str) =>
+ str === "Some filter" ? "Ein Filter" : str;
+
+ const result = getTranslatedFilterDisplayName(
+ "Some filter",
+ tcWithFullTranslation,
+ );
+
+ expect(result).toBe("Ein Filter");
+ });
+});
diff --git a/frontend/src/embedding-sdk-bundle/components/private/ContentTranslationsProvider/ContentTranslationsProvider.tsx b/frontend/src/embedding-sdk-bundle/components/private/ContentTranslationsProvider/ContentTranslationsProvider.tsx
new file mode 100644
index 00000000000..6b394755175
--- /dev/null
+++ b/frontend/src/embedding-sdk-bundle/components/private/ContentTranslationsProvider/ContentTranslationsProvider.tsx
@@ -0,0 +1,7 @@
+import { useSetupAuthContentTranslations } from "embedding-sdk-bundle/hooks/private/use-setup-content-translations";
+
+export const ContentTranslationsProvider = () => {
+ useSetupAuthContentTranslations();
+
+ return null;
+};
diff --git a/frontend/src/embedding-sdk-bundle/components/private/ContentTranslationsProvider/index.ts b/frontend/src/embedding-sdk-bundle/components/private/ContentTranslationsProvider/index.ts
new file mode 100644
index 00000000000..fb2852c43de
--- /dev/null
+++ b/frontend/src/embedding-sdk-bundle/components/private/ContentTranslationsProvider/index.ts
@@ -0,0 +1 @@
+export { ContentTranslationsProvider } from "./ContentTranslationsProvider";
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx
index 00c5fb6940b..87237725d7d 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkBreadcrumbs/SdkBreadcrumbs.tsx
@@ -7,6 +7,7 @@ import type {
SdkBreadcrumbItemType,
} from "embedding-sdk-bundle/types/breadcrumb";
import { Badge } from "metabase/common/components/Badge";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Flex, type IconName } from "metabase/ui";
import { PublicComponentStylesWrapper } from "../PublicComponentStylesWrapper";
@@ -25,6 +26,7 @@ export const SdkBreadcrumbs = ({
onBreadcrumbClick,
}: SdkBreadcrumbProps) => {
const { breadcrumbs, navigateTo } = useSdkBreadcrumbs();
+ const tc = useTranslateContent();
if (breadcrumbs.length === 0) {
return null;
@@ -44,7 +46,7 @@ export const SdkBreadcrumbs = ({
onBreadcrumbClick?.(breadcrumb);
}}
>
- {breadcrumb.name}
+ {tc(breadcrumb.name)}
</Badge>
{index < breadcrumbs.length - 1 && (
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutBadgeList.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutBadgeList.tsx
index e70ed192d88..e1c8b4cab0f 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutBadgeList.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/BreakoutBadgeList.tsx
@@ -5,6 +5,7 @@ import {
useBreakoutData,
} from "embedding-sdk-bundle/components/private/SdkQuestion/components/Breakout/use-breakout-data";
import { useSdkQuestionContext } from "embedding-sdk-bundle/components/private/SdkQuestion/context";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { BadgeList } from "../util/BadgeList";
@@ -18,12 +19,13 @@ export const BreakoutBadgeListInner = ({
onRemoveItem: (item: SDKBreakoutItem, index: number) => void;
}) => {
const breakoutItems = useBreakoutData();
+ const tc = useTranslateContent();
return (
<BadgeList
items={breakoutItems.map((item) => ({
item,
- name: item.longDisplayName,
+ name: tc(item.longDisplayName),
}))}
addButtonLabel={t`Add another grouping`}
onSelectItem={onSelectItem}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/DropdownFilterBadgeList.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/DropdownFilterBadgeList.tsx
index bf11231e4cb..79aea21b508 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/DropdownFilterBadgeList.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/DropdownFilterBadgeList.tsx
@@ -1,5 +1,6 @@
import { useDisclosure } from "@mantine/hooks";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Group, Popover } from "metabase/ui";
import { BadgeListItem } from "../util/BadgeList/BadgeListItem";
@@ -15,6 +16,7 @@ const DropdownFilterBadgeListContent = ({
item: SDKFilterItem;
} & FilterProps) => {
const [opened, { open, close }] = useDisclosure(false);
+ const tc = useTranslateContent();
return (
<Popover opened={opened} onClose={close}>
@@ -22,7 +24,7 @@ const DropdownFilterBadgeListContent = ({
<BadgeListItem
onClick={open}
onRemoveItem={() => item.onRemoveFilter()}
- name={item.displayName}
+ name={tc(item.displayName)}
/>
</Popover.Target>
<Popover.Dropdown>
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/FilterBadgeList.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/FilterBadgeList.tsx
index f123f1092f4..1b9fd981a83 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/FilterBadgeList.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/FilterBadgeList.tsx
@@ -5,6 +5,7 @@ import {
useFilterData,
} from "embedding-sdk-bundle/components/private/SdkQuestion/components/Filter/hooks/use-filter-data";
import { BadgeList } from "embedding-sdk-bundle/components/private/SdkQuestion/components/util/BadgeList";
+import { useTranslateContent } from "metabase/i18n/hooks";
export const FilterBadgeList = ({
onAddItem,
@@ -16,11 +17,12 @@ export const FilterBadgeList = ({
onRemoveItem?: (item: SDKFilterItem) => void;
}) => {
const filterItems = useFilterData();
+ const tc = useTranslateContent();
return (
<BadgeList
addButtonLabel={t`Add another filter`}
- items={filterItems.map((item) => ({ item, name: item.displayName }))}
+ items={filterItems.map((item) => ({ item, name: tc(item.displayName) }))}
onAddItem={onAddItem}
onSelectItem={onSelectItem}
onRemoveItem={onRemoveItem}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/SummarizeBadgeList.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/SummarizeBadgeList.tsx
index 775b834c318..714b495f904 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/SummarizeBadgeList.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/SummarizeBadgeList.tsx
@@ -1,5 +1,7 @@
import { t } from "ttag";
+import { useTranslateContent } from "metabase/i18n/hooks";
+
import { BadgeList, type BadgeListProps } from "../util/BadgeList";
import {
@@ -16,10 +18,14 @@ export const SummarizeBadgeList = ({
"onRemoveItem" | "onAddItem" | "onSelectItem"
>) => {
const aggregationItems = useSummarizeData();
+ const tc = useTranslateContent();
return (
<BadgeList
- items={aggregationItems.map((item) => ({ item, name: item.displayName }))}
+ items={aggregationItems.map((item) => ({
+ item,
+ name: tc(item.displayName),
+ }))}
addButtonLabel={t`Add another summary`}
onSelectItem={onSelectItem}
onAddItem={onAddItem}
diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/DefaultViewTitle.tsx b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/DefaultViewTitle.tsx
index 175ba677321..9698bde317c 100644
--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/DefaultViewTitle.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/DefaultViewTitle.tsx
@@ -58,7 +58,7 @@ export const DefaultViewTitle = ({
}
if (title === undefined || title === true) {
- const originalName = originalQuestion?.displayName();
+ const originalName = tc(originalQuestion?.displayName());
const titleText = tc(getQuestionTitle({ question }));
diff --git a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx
index d2e25f253aa..93106471f42 100644
--- a/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx
+++ b/frontend/src/embedding-sdk-bundle/components/public/ComponentProvider/ComponentProvider.tsx
@@ -2,6 +2,7 @@
import { Global } from "@emotion/react";
import { type JSX, memo, useEffect, useId, useRef } from "react";
+import { ContentTranslationsProvider } from "embedding-sdk-bundle/components/private/ContentTranslationsProvider";
import { SdkThemeProvider } from "embedding-sdk-bundle/components/private/SdkThemeProvider";
import { useInitDataInternal } from "embedding-sdk-bundle/hooks/private/use-init-data";
import { useNormalizeComponentProviderProps } from "embedding-sdk-bundle/hooks/private/use-normalize-component-provider-props";
@@ -123,6 +124,8 @@ export const ComponentProviderInternal = (
<>
<LocaleProvider locale={locale || instanceLocale}>
{children}
+
+ {isInstanceToRender && <ContentTranslationsProvider />}
</LocaleProvider>
{isInstanceToRender && (
diff --git a/frontend/src/embedding-sdk-bundle/hooks/private/use-setup-content-translations.ts b/frontend/src/embedding-sdk-bundle/hooks/private/use-setup-content-translations.ts
index 26d8925bb01..216cb2b4855 100644
--- a/frontend/src/embedding-sdk-bundle/hooks/private/use-setup-content-translations.ts
+++ b/frontend/src/embedding-sdk-bundle/hooks/private/use-setup-content-translations.ts
@@ -15,12 +15,19 @@ export const useSetupContentTranslations = ({
const isGuestEmbed = useSdkSelector(getIsGuestEmbed);
useEffect(() => {
- if (locale !== "en") {
- if (isGuestEmbed && token) {
- PLUGIN_CONTENT_TRANSLATION.setEndpointsForStaticEmbedding(token);
- } else {
- PLUGIN_CONTENT_TRANSLATION.setEndpointsForAuthEmbedding();
- }
+ if (locale !== "en" && isGuestEmbed && token) {
+ PLUGIN_CONTENT_TRANSLATION.setEndpointsForStaticEmbedding(token);
}
}, [isGuestEmbed, locale, token]);
};
+
+export const useSetupAuthContentTranslations = () => {
+ const { locale } = useLocale();
+ const isGuestEmbed = useSdkSelector(getIsGuestEmbed);
+
+ useEffect(() => {
+ if (locale !== "en" && !isGuestEmbed) {
+ PLUGIN_CONTENT_TRANSLATION.setEndpointsForAuthEmbedding();
+ }
+ }, [locale, isGuestEmbed]);
+};
diff --git a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx
index 2d1da00b493..fc382038970 100644
--- a/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx
+++ b/frontend/src/metabase/common/components/AggregationPicker/AggregationPicker.tsx
@@ -13,6 +13,7 @@ import {
} from "metabase/common/components/MetadataInfo/InfoIcon";
import { Popover } from "metabase/common/components/MetadataInfo/Popover";
import { useToggle } from "metabase/common/hooks/use-toggle";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { useSelector } from "metabase/lib/redux";
import {
ExpressionWidget,
@@ -97,6 +98,7 @@ export function AggregationPicker({
onBack,
readOnly,
}: AggregationPickerProps) {
+ const tc = useTranslateContent();
const metadata = useSelector(getMetadata);
const displayInfo = clause
? Lib.displayInfo(query, stageIndex, clause)
@@ -351,6 +353,44 @@ export function AggregationPicker({
[onSelect, onClose],
);
+ const renderItemName = useCallback(
+ (item: Item) => tc(item.displayName),
+ [tc],
+ );
+
+ const renderItemIcon = useCallback(
+ (item: Item) => {
+ if (item.type !== "metric" && item.type !== "measure") {
+ return null;
+ }
+
+ if (!item.description) {
+ return null;
+ }
+
+ return (
+ <Flex pr="sm" align="center">
+ <Popover
+ position="right"
+ content={
+ <Box p="md">
+ <Markdown disallowHeading unstyleLinks>
+ {tc(item.description)}
+ </Markdown>
+ </Box>
+ }
+ >
+ <span aria-label={t`More info`}>
+ <PopoverDefaultIcon name="empty" size={18} />
+ <PopoverHoverTarget name="info" size={18} />
+ </span>
+ </Popover>
+ </Flex>
+ );
+ },
+ [tc],
+ );
+
if (isEditingExpression) {
return (
<ExpressionWidget
@@ -442,44 +482,10 @@ function ColumnPickerHeader({
);
}
-function renderItemName(item: Item) {
- return item.displayName;
-}
-
function renderItemWrapper(content: ReactNode) {
return <HoverParent>{content}</HoverParent>;
}
-function renderItemIcon(item: Item) {
- if (item.type !== "metric" && item.type !== "measure") {
- return null;
- }
-
- if (!item.description) {
- return null;
- }
-
- return (
- <Flex pr="sm" align="center">
- <Popover
- position="right"
- content={
- <Box p="md">
- <Markdown disallowHeading unstyleLinks>
- {item.description}
- </Markdown>
- </Box>
- }
- >
- <span aria-label={t`More info`}>
- <PopoverDefaultIcon name="empty" size={18} />
- <PopoverHoverTarget name="info" size={18} />
- </span>
- </Popover>
- </Flex>
- );
-}
-
function omitItemDescription() {
return null;
}
diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
index b0542abf725..ceca8010900 100644
--- a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
+++ b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx
@@ -11,6 +11,7 @@ import {
QueryColumnInfoIcon,
} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
import { getColumnGroupIcon } from "metabase/common/utils/column-groups";
+import { useTranslateContent } from "metabase/i18n/hooks";
import type { ColorName } from "metabase/lib/colors/types";
import { isNotNull } from "metabase/lib/types";
import {
@@ -100,6 +101,7 @@ export function QueryColumnPicker({
alwaysExpanded,
disableSearch,
}: QueryColumnPickerProps) {
+ const tc = useTranslateContent();
const withCustomExpressions = onSelectExpression != null;
const [isSearching, setIsSearching] = useState(false);
@@ -117,12 +119,12 @@ export function QueryColumnPicker({
type: "column" as const,
...columnInfo,
column,
- combinedDisplayName: `${columnInfo.table?.displayName ?? ""} ${columnInfo.displayName}`,
+ combinedDisplayName: `${tc(columnInfo.table?.displayName) ?? ""} ${tc(columnInfo.displayName)}`,
};
});
return {
- name: groupInfo.displayName,
+ name: tc(groupInfo.displayName),
icon: getColumnGroupIcon(groupInfo),
items,
};
@@ -162,6 +164,7 @@ export function QueryColumnPicker({
withCustomExpressions,
expressionSectionIcon,
isSearching,
+ tc,
]);
const handleSelectSection = useCallback(
@@ -313,6 +316,11 @@ export function QueryColumnPicker({
[checkIsColumnSelected],
);
+ const renderItemName = useCallback(
+ (item: Item) => tc(item.displayName),
+ [tc],
+ );
+
return (
<DelayGroup>
<AccordionList<Item, QueryColumnPickerSection>
@@ -362,10 +370,6 @@ function getColumnWithoutBucketing(
return column;
}
-function renderItemName(item: Item) {
- return item.displayName;
-}
-
function renderItemWrapper(content: ReactNode) {
return <HoverParent className={S.itemWrapper}>{content}</HoverParent>;
}
diff --git a/frontend/src/metabase/plugins/oss/content-translation.ts b/frontend/src/metabase/plugins/oss/content-translation.ts
index a103081b5fe..850cb142672 100644
--- a/frontend/src/metabase/plugins/oss/content-translation.ts
+++ b/frontend/src/metabase/plugins/oss/content-translation.ts
@@ -21,6 +21,11 @@ const getDefaultPluginContentTranslation = () => ({
obj: T,
_tc: ContentTranslationFunction,
) => obj,
+ getTranslatedFilterDisplayName: (
+ displayName: string,
+ _tc: ContentTranslationFunction,
+ _columnDisplayName: string | undefined,
+ ): string => displayName,
useTranslateFieldValuesInHoveredObject: (obj?: HoveredObject | null) => obj,
useTranslateSeries: (obj: Series) => obj,
useSortByContentTranslation: () => (a: string, b: string) =>
diff --git a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
index 3630f1b5185..8cf0a3490c0 100644
--- a/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
+++ b/frontend/src/metabase/query_builder/components/view/ViewHeader/components/QueryBuilderBackButton/QueryBuilderBackButton.tsx
@@ -2,6 +2,7 @@ import type { HTMLAttributes } from "react";
import { Link } from "react-router";
import { t } from "ttag";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { useDispatch, useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { navigateBackToDashboard } from "metabase/query_builder/actions";
@@ -31,6 +32,7 @@ export function QueryBuilderBackButton({
const stateParent = useSelector(getParentEntity);
const parent = parentOverride ?? stateParent;
const dispatch = useDispatch();
+ const tc = useTranslateContent();
const handleClick = () => {
if (parent.model === "dashboard") {
@@ -45,7 +47,7 @@ export function QueryBuilderBackButton({
return null;
}
- const label = t`Back to ${parent.name}`;
+ const label = t`Back to ${tc(parent.name)}`;
return (
<Tooltip label={label}>
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnList.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnList.tsx
index 1ef1db32885..3c7fe01f0bb 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnList.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnList.tsx
@@ -3,6 +3,7 @@ import { t } from "ttag";
import Input from "metabase/common/components/Input";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";
import { isNotNull } from "metabase/lib/types";
import {
@@ -23,6 +24,7 @@ export function BreakoutColumnList({
onQueryChange,
stageIndex = -1,
}: BreakoutColumnListProps) {
+ const tc = useTranslateContent();
const {
onAddBreakout,
onUpdateBreakout,
@@ -141,7 +143,7 @@ export function BreakoutColumnList({
{sections.map((section) => (
<li key={section.name}>
<Box className={BreakoutColumnListS.ColumnGroupName}>
- {section.name}
+ {tc(section.name)}
</Box>
<ul>
{section.items.map((item, itemIndex) => (
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
index 8e33901fcf4..67882a13d3d 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/SummarizeSidebar/BreakoutColumnList/BreakoutColumnListItem/BreakoutColumnListItem.tsx
@@ -10,6 +10,7 @@ import {
QueryColumnInfoIcon,
} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
import { BucketPickerPopover } from "metabase/common/components/QueryColumnPicker/BucketPickerPopover";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Tooltip } from "metabase/ui";
import { Box, type BoxProps, Flex } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -61,6 +62,7 @@ export function BreakoutColumnListItem({
onRemoveBreakout,
onReplaceBreakouts,
}: BreakoutColumnListItemProps) {
+ const tc = useTranslateContent();
const isSelected = breakout != null;
const handleAddClick = useCallback(() => {
@@ -81,7 +83,7 @@ export function BreakoutColumnListItem({
[breakout, onRemoveBreakout],
);
- const displayName = isPinned ? item.longDisplayName : item.displayName;
+ const displayName = tc(isPinned ? item.longDisplayName : item.displayName);
return (
<HoverParent
diff --git a/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsx b/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsx
index d6a08a52ed5..93bacbea66a 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsx
@@ -1,5 +1,7 @@
import { useMemo, useState } from "react";
+import { useTranslateContent } from "metabase/i18n/hooks";
+import { getTranslatedFilterDisplayName } from "metabase/querying/filters/utils/display";
import { Popover } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -22,10 +24,11 @@ export function FilterPanelPopover({
onChange,
}: FilterPanelPopoverProps) {
const [isOpened, setIsOpened] = useState(false);
+ const tc = useTranslateContent();
- const filterInfo = useMemo(
- () => Lib.displayInfo(query, stageIndex, filter),
- [query, stageIndex, filter],
+ const translatedFilterName = useMemo(
+ () => getTranslatedFilterDisplayName(query, stageIndex, filter, tc),
+ [query, stageIndex, filter, tc],
);
const handleChange = (newFilter: Lib.Clause | Lib.SegmentMetadata) => {
@@ -50,7 +53,7 @@ export function FilterPanelPopover({
onClick={() => setIsOpened((isOpened) => !isOpened)}
onRemoveClick={handleRemove}
>
- {filterInfo.longDisplayName}
+ {translatedFilterName}
</FilterPill>
</Popover.Target>
<Popover.Dropdown data-testid="filter-picker-dropdown">
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx
index beab2d7c73e..92cbf4276cf 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx
@@ -1,5 +1,5 @@
import cx from "classnames";
-import { type ReactNode, useMemo, useState } from "react";
+import { type ReactNode, useCallback, useMemo, useState } from "react";
import { t } from "ttag";
import {
@@ -11,6 +11,7 @@ import {
QueryColumnInfoIcon,
} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
import { getColumnGroupIcon } from "metabase/common/utils/column-groups";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { isNotNull } from "metabase/lib/types";
import {
type DefinedClauseName,
@@ -83,6 +84,7 @@ export function FilterColumnPicker({
withColumnGroupIcon = true,
withColumnItemIcon = true,
}: FilterColumnPickerProps) {
+ const tc = useTranslateContent();
const [searchText, setSearchText] = useState("");
const isSearching = searchText !== "";
@@ -94,6 +96,7 @@ export function FilterColumnPicker({
withColumnGroupIcon,
withCustomExpression,
isSearching,
+ tc,
}),
[
query,
@@ -101,9 +104,15 @@ export function FilterColumnPicker({
withColumnGroupIcon,
withCustomExpression,
isSearching,
+ tc,
],
);
+ const renderItemName = useCallback(
+ (item: Item) => tc(item.displayName),
+ [tc],
+ );
+
const handleSectionChange = (section: Section) => {
if (section.key === "custom-expression") {
onExpressionSelect?.();
@@ -165,12 +174,14 @@ function getSections({
withColumnGroupIcon,
withCustomExpression,
isSearching,
+ tc,
}: {
query: Lib.Query;
stageIndexes: number[];
withColumnGroupIcon: boolean;
withCustomExpression: boolean;
isSearching: boolean;
+ tc: (content: string | null | undefined) => string | null | undefined;
}): Section[] {
const withMultipleStages = stageIndexes.length > 1;
const columnSections = stageIndexes.flatMap((stageIndex) => {
@@ -206,9 +217,11 @@ function getSections({
});
return {
- name: withMultipleStages
- ? getGroupName(groupInfo, stageIndex)
- : groupInfo.displayName,
+ name: tc(
+ withMultipleStages
+ ? getGroupName(groupInfo, stageIndex)
+ : groupInfo.displayName,
+ ),
icon: withColumnGroupIcon ? getColumnGroupIcon(groupInfo) : null,
items: [...segmentItems, ...columnItems],
};
@@ -242,10 +255,6 @@ function getSections({
].filter(isNotNull);
}
-function renderItemName(item: Item) {
- return item.displayName;
-}
-
function renderItemIcon(query: Lib.Query, item: Item) {
if (isSegmentListItem(item)) {
return <Icon name="star" size={18} />;
diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx
index e3cd947e30e..dfa97807449 100644
--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx
+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx
@@ -1,5 +1,6 @@
import type { ReactNode } from "react";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Flex, PopoverBackButton } from "metabase/ui";
interface FilterPickerHeaderProps {
@@ -15,6 +16,7 @@ export function FilterPickerHeader({
readOnly,
onBack,
}: FilterPickerHeaderProps) {
+ const tc = useTranslateContent();
return (
<Flex px="md" pt="md" justify="space-between">
{onBack && (
@@ -24,7 +26,7 @@ export function FilterPickerHeader({
disabled={readOnly}
withArrow={!readOnly}
>
- {columnName}
+ {tc(columnName)}
</PopoverBackButton>
)}
{children}
diff --git a/frontend/src/metabase/querying/filters/utils/display.ts b/frontend/src/metabase/querying/filters/utils/display.ts
new file mode 100644
index 00000000000..3bd80866bc0
--- /dev/null
+++ b/frontend/src/metabase/querying/filters/utils/display.ts
@@ -0,0 +1,22 @@
+import type { ContentTranslationFunction } from "metabase/i18n/types";
+import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
+import * as Lib from "metabase-lib";
+
+export const getTranslatedFilterDisplayName = (
+ query: Lib.Query,
+ stageIndex: number,
+ filter: Lib.FilterClause,
+ tc: ContentTranslationFunction,
+): string => {
+ const displayInfo = Lib.displayInfo(query, stageIndex, filter);
+ const parts = Lib.filterParts(query, stageIndex, filter);
+ const columnDisplayName = parts?.column
+ ? Lib.displayInfo(query, stageIndex, parts.column).displayName
+ : undefined;
+
+ return PLUGIN_CONTENT_TRANSLATION.getTranslatedFilterDisplayName(
+ displayInfo.longDisplayName ?? "",
+ tc,
+ columnDisplayName,
+ );
+};
diff --git a/frontend/src/metabase/querying/filters/utils/display.unit.spec.ts b/frontend/src/metabase/querying/filters/utils/display.unit.spec.ts
new file mode 100644
index 00000000000..8dad32722ae
--- /dev/null
+++ b/frontend/src/metabase/querying/filters/utils/display.unit.spec.ts
@@ -0,0 +1,36 @@
+import type { ContentTranslationFunction } from "metabase/i18n/types";
+import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";
+
+describe("getTranslatedFilterDisplayName (OSS)", () => {
+ const noopTc: ContentTranslationFunction = (str) => str;
+
+ it("should return displayName unchanged", () => {
+ const result = PLUGIN_CONTENT_TRANSLATION.getTranslatedFilterDisplayName(
+ "Total is greater than 100",
+ noopTc,
+ "Total",
+ );
+
+ expect(result).toBe("Total is greater than 100");
+ });
+
+ it("should return displayName unchanged when columnDisplayName is undefined", () => {
+ const result = PLUGIN_CONTENT_TRANSLATION.getTranslatedFilterDisplayName(
+ "Some filter",
+ noopTc,
+ undefined,
+ );
+
+ expect(result).toBe("Some filter");
+ });
+
+ it("should return empty string when displayName is empty", () => {
+ const result = PLUGIN_CONTENT_TRANSLATION.getTranslatedFilterDisplayName(
+ "",
+ noopTc,
+ undefined,
+ );
+
+ expect(result).toBe("");
+ });
+});
diff --git a/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsx b/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsx
index f808d63c95f..0d03ada4ebc 100644
--- a/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsx
@@ -2,6 +2,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import { AggregationPicker } from "metabase/common/components/AggregationPicker";
+import { useTranslateContent } from "metabase/i18n/hooks";
import * as Lib from "metabase-lib";
import type { NotebookStepProps } from "../../types";
@@ -17,6 +18,7 @@ export function AggregateStep({
}: NotebookStepProps) {
const { question, stageIndex } = step;
const isMetric = question.type() === "metric";
+ const tc = useTranslateContent();
const aggregations = useMemo(() => {
return Lib.aggregations(query, stageIndex);
@@ -44,7 +46,7 @@ export function AggregateStep({
};
const renderAggregationName = (aggregation: Lib.AggregationClause) =>
- Lib.displayInfo(query, stageIndex, aggregation).longDisplayName;
+ tc(Lib.displayInfo(query, stageIndex, aggregation).longDisplayName);
return (
<ClauseStep
diff --git a/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsx b/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsx
index a32349b3fcd..3ab17b9dfcc 100644
--- a/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsx
@@ -2,6 +2,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import { QueryColumnPicker } from "metabase/common/components/QueryColumnPicker";
+import { useTranslateContent } from "metabase/i18n/hooks";
import * as Lib from "metabase-lib";
import type { NotebookStepProps } from "../../types";
@@ -17,6 +18,7 @@ export function BreakoutStep({
}: NotebookStepProps) {
const { question, stageIndex } = step;
const isMetric = question.type() === "metric";
+ const tc = useTranslateContent();
const breakouts = useMemo(
() => Lib.breakouts(query, stageIndex),
@@ -33,7 +35,7 @@ export function BreakoutStep({
const isAddButtonDisabled = isMetric && metricColumns.length === 0;
const renderBreakoutName = (clause: Lib.BreakoutClause) =>
- Lib.displayInfo(query, stageIndex, clause).longDisplayName;
+ tc(Lib.displayInfo(query, stageIndex, clause).longDisplayName);
const handleAddBreakout = (column: Lib.ColumnMetadata) => {
const nextQuery = Lib.breakout(query, stageIndex, column);
diff --git a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.tsx b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.tsx
index 83c7b55736c..610d4c347e9 100644
--- a/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/ExpressionStep/ExpressionStep.tsx
@@ -1,5 +1,6 @@
import { useMemo } from "react";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { ExpressionWidget } from "metabase/query_builder/components/expressions/ExpressionWidget";
import * as Lib from "metabase-lib";
import { getUniqueExpressionName } from "metabase-lib/v1/queries/utils/expression";
@@ -16,13 +17,14 @@ export const ExpressionStep = ({
step,
}: NotebookStepProps): JSX.Element => {
const { query, stageIndex } = step;
+ const tc = useTranslateContent();
const expressions = useMemo(
() => Lib.expressions(query, stageIndex),
[query, stageIndex],
);
const renderExpressionName = (expression: Lib.ExpressionClause) => {
- return Lib.displayInfo(query, stageIndex, expression).longDisplayName;
+ return tc(Lib.displayInfo(query, stageIndex, expression).longDisplayName);
};
const handleReorderExpression = (
diff --git a/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.tsx b/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.tsx
index 4e1e228b565..7c2b85b9b19 100644
--- a/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.tsx
+++ b/frontend/src/metabase/querying/notebook/components/FieldPicker/FieldPicker.tsx
@@ -5,6 +5,7 @@ import {
HoverParent,
QueryColumnInfoIcon,
} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Checkbox, DelayGroup } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -44,6 +45,7 @@ export const FieldPicker = ({
isColumnDisabled,
...props
}: FieldPickerProps) => {
+ const tc = useTranslateContent();
const items = useMemo(() => {
const items = columns.map((column) => ({
column,
@@ -99,7 +101,9 @@ export const FieldPicker = ({
position="top-start"
size={16}
/>
- <div className={S.ItemTitle}>{item.columnInfo.displayName}</div>
+ <div className={S.ItemTitle}>
+ {tc(item.columnInfo.displayName)}
+ </div>
</HoverParent>
</li>
))}
diff --git a/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx b/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx
index bf1c74cb7b5..877bb768e03 100644
--- a/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx
@@ -1,8 +1,11 @@
import { useMemo } from "react";
import { t } from "ttag";
+import _ from "underscore";
import ErrorBoundary from "metabase/ErrorBoundary";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { FilterPicker } from "metabase/querying/filters/components/FilterPicker";
+import { getTranslatedFilterDisplayName } from "metabase/querying/filters/utils/display";
import * as Lib from "metabase-lib";
import type { NotebookStepProps } from "../../types";
@@ -17,14 +20,20 @@ export function FilterStep({
updateQuery,
}: NotebookStepProps) {
const { stageIndex } = step;
+ const tc = useTranslateContent();
const filters = useMemo(
() => Lib.filters(query, stageIndex),
[query, stageIndex],
);
- const renderFilterName = (filter: Lib.FilterClause) =>
- Lib.displayInfo(query, stageIndex, filter).longDisplayName;
+ const renderFilterName = useMemo(
+ () =>
+ _.memoize((filter: Lib.FilterClause) =>
+ getTranslatedFilterDisplayName(query, stageIndex, filter, tc),
+ ),
+ [query, stageIndex, tc],
+ );
const handleAddFilter = (clause: Lib.Filterable) => {
const nextQuery = Lib.filter(query, stageIndex, clause);
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx
index da9ed13647f..787bcdee522 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx
@@ -1,6 +1,7 @@
import { useMemo, useState } from "react";
import { t } from "ttag";
+import { useTranslateContent } from "metabase/i18n/hooks";
import type { ColorName } from "metabase/lib/colors/types";
import { Flex, Text, rem } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -41,6 +42,7 @@ export function JoinComplete({
onQueryChange,
onDraftRhsTableChange,
}: JoinCompleteProps) {
+ const tc = useTranslateContent();
const strategy = useMemo(() => Lib.joinStrategy(join), [join]);
const rhsTable = useMemo(() => Lib.joinedThing(query, join), [query, join]);
const conditions = useMemo(() => Lib.joinConditions(join), [join]);
@@ -106,7 +108,7 @@ export function JoinComplete({
<NotebookCell className={S.JoinConditionCell} color={color}>
<Flex gap={6} align="center">
<NotebookCellItem color={color} disabled aria-label={t`Left table`}>
- {lhsTableName}
+ {tc(lhsTableName)}
</NotebookCellItem>
<JoinStrategyPicker
query={query}
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnButton/JoinColumnButton.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnButton/JoinColumnButton.tsx
index 181b91079ec..e8d53c077b9 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnButton/JoinColumnButton.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinConditionColumnPicker/JoinColumnButton/JoinColumnButton.tsx
@@ -2,6 +2,7 @@ import cx from "classnames";
import { type Ref, forwardRef, useMemo } from "react";
import { t } from "ttag";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Text } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -33,10 +34,11 @@ export const JoinColumnButton = forwardRef(function JoinColumnTarget(
}: JoinColumnButtonProps,
ref: Ref<HTMLButtonElement>,
) {
+ const tc = useTranslateContent();
const expression = isLhsPicker ? lhsExpression : rhsExpression;
const buttonLabel = useMemo(
- () => getButtonLabel(query, stageIndex, expression),
- [query, stageIndex, expression],
+ () => getButtonLabel(query, stageIndex, expression, tc),
+ [query, stageIndex, expression, tc],
);
const isEmpty = expression == null;
const isLiteral =
@@ -64,7 +66,7 @@ export const JoinColumnButton = forwardRef(function JoinColumnTarget(
ta="left"
fw={400}
>
- {tableName}
+ {tc(tableName)}
</Text>
)}
<Text
@@ -85,6 +87,7 @@ function getButtonLabel(
query: Lib.Query,
stageIndex: number,
expression: Lib.ExpressionClause | undefined,
+ tc: (content: string | null | undefined) => string | null | undefined,
) {
if (expression == null) {
return t`Pick a column…`;
@@ -94,7 +97,7 @@ function getButtonLabel(
Lib.isJoinConditionLHSorRHSLiteral(expression) ||
Lib.isJoinConditionLHSorRHSColumn(expression)
) {
- return Lib.displayInfo(query, stageIndex, expression).displayName;
+ return tc(Lib.displayInfo(query, stageIndex, expression).displayName);
}
return t`Custom expression`;
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx
index d3be95eb2bc..25354757639 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx
@@ -2,6 +2,7 @@ import { useLayoutEffect, useMemo, useState } from "react";
import { useLatest } from "react-use";
import { t } from "ttag";
+import { useTranslateContent } from "metabase/i18n/hooks";
import type { ColorName } from "metabase/lib/colors/types";
import { Flex, Text, rem } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -34,6 +35,7 @@ export function JoinDraft({
isReadOnly,
onJoinChange,
}: JoinDraftProps) {
+ const tc = useTranslateContent();
const sourceTableId = Lib.sourceTableOrCardId(query);
const [strategy, setStrategy] = useState(
() => initialStrategy ?? getDefaultJoinStrategy(query, stageIndex),
@@ -110,7 +112,7 @@ export function JoinDraft({
<NotebookCell className={S.JoinCell} color={color}>
<Flex gap={6} align="center">
<NotebookCellItem color={color} disabled aria-label={t`Left table`}>
- {lhsTableName}
+ {tc(lhsTableName)}
</NotebookCellItem>
<JoinStrategyPicker
query={query}
diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx
index 6ccaba14104..a99934f93a9 100644
--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx
+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx
@@ -2,6 +2,7 @@ import type React from "react";
import { type MouseEvent, type Ref, forwardRef } from "react";
import { t } from "ttag";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { useSelector } from "metabase/lib/redux";
import * as Urls from "metabase/lib/urls";
import { getIsEmbedding } from "metabase/selectors/embed";
@@ -37,6 +38,7 @@ export const DataPickerTarget = forwardRef(function DataPickerTarget(
}: DataPickerTargetProps,
ref: Ref<HTMLButtonElement>,
) {
+ const tc = useTranslateContent();
const tableInfo =
table != null ? Lib.displayInfo(query, stageIndex, table) : undefined;
const isEmbedding = useSelector(getIsEmbedding);
@@ -86,7 +88,7 @@ export const DataPickerTarget = forwardRef(function DataPickerTarget(
{tableInfo && (
<Icon name={getTableIcon(tableInfo)} style={{ flexShrink: 0 }} />
)}
- {tableInfo?.displayName ?? placeholder}
+ {tc(tableInfo?.displayName) ?? placeholder}
</Flex>
</UnstyledButton>
);
diff --git a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx
index ba4a5ef6176..538c3c7aed4 100644
--- a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx
+++ b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx
@@ -2,6 +2,7 @@ import { useMemo } from "react";
import { t } from "ttag";
import { QueryColumnPicker } from "metabase/common/components/QueryColumnPicker";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { Icon } from "metabase/ui";
import * as Lib from "metabase-lib";
@@ -169,6 +170,7 @@ function SortDisplayName({
onToggleSortDirection,
disabled,
}: SortDisplayNameProps) {
+ const tc = useTranslateContent();
const icon = displayInfo.direction === "asc" ? "arrow_up" : "arrow_down";
return (
<button
@@ -181,7 +183,7 @@ function SortDisplayName({
disabled={disabled}
>
<Icon name={icon} />
- <span>{displayInfo.longDisplayName}</span>
+ <span>{tc(displayInfo.longDisplayName)}</span>
</button>
);
}
diff --git a/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx b/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
index 08139558d1a..4dabfeb4b21 100644
--- a/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
+++ b/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx
@@ -1,8 +1,11 @@
import { useCallback, useMemo } from "react";
import { t } from "ttag";
+import _ from "underscore";
import ErrorBoundary from "metabase/ErrorBoundary";
+import { useTranslateContent } from "metabase/i18n/hooks";
import { FilterPicker } from "metabase/querying/filters/components/FilterPicker";
+import { getTranslatedFilterDisplayName } from "metabase/querying/filters/utils/display";
import { ClauseStep } from "metabase/querying/notebook/components/ClauseStep";
import * as Lib from "metabase-lib";
@@ -19,12 +22,15 @@ export function SegmentFilterEditor({
onChange,
readOnly = false,
}: SegmentFilterEditorProps) {
+ const tc = useTranslateContent();
const filters = useMemo(() => Lib.filters(query, STAGE_INDEX), [query]);
- const renderFilterName = useCallback(
- (filter: Lib.FilterClause) =>
- Lib.displayInfo(query, STAGE_INDEX, filter).longDisplayName,
- [query],
+ const renderFilterName = useMemo(
+ () =>
+ _.memoize((filter: Lib.FilterClause) =>
+ getTranslatedFilterDisplayName(query, STAGE_INDEX, filter, tc),
+ ),
+ [query, tc],
);
const handleSelectFilter = useCallback(