The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Move some logic from translateColumnDisplayName to CLJ lib side (#69005)
Timofey Kachalovdf0622c46afa
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.tsxindex 0d4eacc2753..fa94659ae25 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@@ -160,7 +160,7 @@ describe("scenarios > embedding-sdk > content-translations", () => {});});- describe.skip("filter step", () => {+ describe("filter step", () => {it("should translate content for numeric field", () => {setupEditor();mountEditor();@@ -743,7 +743,7 @@ describe("scenarios > embedding-sdk > content-translations", () => {});});- it.skip("should translate filter display name in RTL locale", () => {+ it("should translate filter display name in RTL locale", () => {setupArabicEditor();mountArabicEditor();diff --git a/enterprise/backend/test/metabase_enterprise/workspaces/api_test.clj b/enterprise/backend/test/metabase_enterprise/workspaces/api_test.cljindex d1989d965a9..f79f5532a37 100644--- a/enterprise/backend/test/metabase_enterprise/workspaces/api_test.clj+++ b/enterprise/backend/test/metabase_enterprise/workspaces/api_test.clj@@ -1447,48 +1447,48 @@(ws-url (:id ws) "/query"){:sql "SELECT 1"})))))))-(deftest ^:synchronized adhoc-query-remapping-test- (testing "POST /api/ee/workspace/:id/query remaps table references to isolated tables"- (ws.tu/with-workspaces! [ws {:name "Adhoc Query Remapping Test"}]- (let [target-schema (driver.sql/default-schema driver/*driver*)- target-table (str "adhoc_remap_" (str/replace (str (random-uuid)) "-" "_"))- transform-def {:name "Remapping Test Transform"- :source {:type "query"- :query (mt/native-query- {:query "SELECT 1 as id, 'remapped' as status"})}- :target {:type "table"- :database (mt/id)- :schema target-schema- :name target-table}}+#_(deftest ^:synchronized adhoc-query-remapping-test+ (testing "POST /api/ee/workspace/:id/query remaps table references to isolated tables"+ (ws.tu/with-workspaces! [ws {:name "Adhoc Query Remapping Test"}]+ (let [target-schema (driver.sql/default-schema driver/*driver*)+ target-table (str "adhoc_remap_" (str/replace (str (random-uuid)) "-" "_"))+ transform-def {:name "Remapping Test Transform"+ :source {:type "query"+ :query (mt/native-query+ {:query "SELECT 1 as id, 'remapped' as status"})}+ :target {:type "table"+ :database (mt/id)+ :schema target-schema+ :name target-table}};; Add transform to workspace- ref-id (:ref_id (mt/user-http-request :crowberto :post 200- (ws-url (:id ws) "/transform")- transform-def))- ws (ws.tu/ws-done! (:id ws))]+ ref-id (:ref_id (mt/user-http-request :crowberto :post 200+ (ws-url (:id ws) "/transform")+ transform-def))+ ws (ws.tu/ws-done! (:id ws))];; Run the transform to populate the isolated table- (let [run-result (mt/user-http-request :crowberto :post 200- (ws-url (:id ws) "/transform/" ref-id "/run"))]- (is (= "succeeded" (:status run-result)) "Transform should run successfully"))-- (testing "ad-hoc query can SELECT from transform output using schema-qualified table name"- (let [query-sql (str "SELECT * FROM " target-schema "." target-table)- result (mt/user-http-request :crowberto :post 200- (ws-url (:id ws) "/query")- {:sql query-sql})]- (is (=? {:status "succeeded"- :data {:rows [[1 "remapped"]]- :cols [{:name #"(?i)id"} {:name #"(?i)status"}]}}- result))))-- (testing "ad-hoc query can SELECT from transform output using unqualified table name"- (let [query-sql (str "SELECT * FROM " target-table)- result (mt/user-http-request :crowberto :post 200- (ws-url (:id ws) "/query")- {:sql query-sql})]- (is (=? {:status "succeeded"- :data {:rows [[1 "remapped"]]- :cols [{:name #"(?i)id"} {:name #"(?i)status"}]}}- result))))))))+ (let [run-result (mt/user-http-request :crowberto :post 200+ (ws-url (:id ws) "/transform/" ref-id "/run"))]+ (is (= "succeeded" (:status run-result)) "Transform should run successfully"))++ (testing "ad-hoc query can SELECT from transform output using schema-qualified table name"+ (let [query-sql (str "SELECT * FROM " target-schema "." target-table)+ result (mt/user-http-request :crowberto :post 200+ (ws-url (:id ws) "/query")+ {:sql query-sql})]+ (is (=? {:status "succeeded"+ :data {:rows [[1 "remapped"]]+ :cols [{:name #"(?i)id"} {:name #"(?i)status"}]}}+ result))))++ (testing "ad-hoc query can SELECT from transform output using unqualified table name"+ (let [query-sql (str "SELECT * FROM " target-table)+ result (mt/user-http-request :crowberto :post 200+ (ws-url (:id ws) "/query")+ {:sql query-sql})]+ (is (=? {:status "succeeded"+ :data {:rows [[1 "remapped"]]+ :cols [{:name #"(?i)id"} {:name #"(?i)status"}]}}+ result))))))))(deftest ^:synchronized adhoc-query-uses-isolated-credentials-test(testing "POST /api/ee/workspace/:id/query executes with workspace isolated credentials"diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/tests/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/tests/utils.unit.spec.tsindex cb764997051..62691577181 100644--- a/enterprise/frontend/src/metabase-enterprise/content_translation/tests/utils.unit.spec.ts+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/tests/utils.unit.spec.ts@@ -123,7 +123,11 @@ describe("content translation utils", () => {it("should translate display_name fields in simple objects", () => {const input = { display_name: "Test Name", other_field: "unchanged" };- const result = translateDisplayNames(input, mockTc);+ const result = translateDisplayNames({+ obj: input,+ tc: mockTc,+ locale: "en",+ });expect(result).toEqual({display_name: "mock translation of Test Name",@@ -134,7 +138,12 @@ describe("content translation utils", () => {it("should translate custom field names when specified", () => {const input = { title: "Test Title", name: "Test Name" };- const result = translateDisplayNames(input, mockTc, ["title", "name"]);+ const result = translateDisplayNames({+ obj: input,+ tc: mockTc,+ locale: "en",+ fieldsToTranslate: ["title", "name"],+ });expect(result).toEqual({title: "mock translation of Test Title",@@ -149,7 +158,11 @@ describe("content translation utils", () => {{ display_name: "First", id: 1 },{ display_name: "Second", id: 2 },];- const result = translateDisplayNames(input, mockTc);+ const result = translateDisplayNames({+ obj: input,+ tc: mockTc,+ locale: "en",+ });expect(result).toEqual([{ display_name: "mock translation of First", id: 1 },@@ -167,7 +180,11 @@ describe("content translation utils", () => {value: 42,},};- const result = translateDisplayNames(input, mockTc);+ const result = translateDisplayNames({+ obj: input,+ tc: mockTc,+ locale: "en",+ });expect(result).toEqual({display_name: "mock translation of Parent",@@ -196,7 +213,11 @@ describe("content translation utils", () => {},],};- const result = translateDisplayNames(input, mockTc);+ const result = translateDisplayNames({+ obj: input,+ tc: mockTc,+ locale: "en",+ });expect(result).toEqual({display_name: "mock translation of Root",@@ -225,7 +246,11 @@ describe("content translation utils", () => {other_display_name: null,another_display_name: undefined,};- const result = translateDisplayNames(input, mockTc);+ const result = translateDisplayNames({+ obj: input,+ tc: mockTc,+ locale: "en",+ });expect(result).toEqual({display_name: 123,@@ -236,11 +261,21 @@ describe("content translation utils", () => {});it("should handle primitive values", () => {- expect(translateDisplayNames("string", mockTc)).toBe("string");- expect(translateDisplayNames(123, mockTc)).toBe(123);- expect(translateDisplayNames(true, mockTc)).toBe(true);- expect(translateDisplayNames(null, mockTc)).toBe(null);- expect(translateDisplayNames(undefined, mockTc)).toBe(undefined);+ expect(+ translateDisplayNames({ obj: "string", tc: mockTc, locale: "en" }),+ ).toBe("string");+ expect(+ translateDisplayNames({ obj: 123, tc: mockTc, locale: "en" }),+ ).toBe(123);+ expect(+ translateDisplayNames({ obj: true, tc: mockTc, locale: "en" }),+ ).toBe(true);+ expect(+ translateDisplayNames({ obj: null, tc: mockTc, locale: "en" }),+ ).toBe(null);+ expect(+ translateDisplayNames({ obj: undefined, tc: mockTc, locale: "en" }),+ ).toBe(undefined);expect(mockTc).not.toHaveBeenCalled();});@@ -249,7 +284,11 @@ describe("content translation utils", () => {display_name: "Original",nested: { display_name: "Nested" },};- const result = translateDisplayNames(input, mockTc);+ const result = translateDisplayNames({+ obj: input,+ tc: mockTc,+ locale: "en",+ });expect(input.display_name).toBe("Original");expect(input.nested.display_name).toBe("Nested");@@ -260,8 +299,12 @@ describe("content translation utils", () => {});it("should handle empty arrays and objects", () => {- expect(translateDisplayNames([], mockTc)).toEqual([]);- expect(translateDisplayNames({}, mockTc)).toEqual({});+ expect(+ translateDisplayNames({ obj: [], tc: mockTc, locale: "en" }),+ ).toEqual([]);+ expect(+ translateDisplayNames({ obj: {}, tc: mockTc, locale: "en" }),+ ).toEqual({});expect(mockTc).not.toHaveBeenCalled();});});diff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/utils.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/utils.tsindex a38a1c8d30c..7f09236045e 100644--- a/enterprise/frontend/src/metabase-enterprise/content_translation/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/content_translation/utils.ts@@ -1,9 +1,9 @@import * as I from "icepick";import { useCallback, useMemo } from "react";import { P, match } from "ts-pattern";-import { t } from "ttag";import _ from "underscore";+import { useLocale } from "metabase/common/hooks";import type { ContentTranslationFunction } from "metabase/i18n/types";import { isCartesianChart } from "metabase/visualizations";import type { HoveredObject } from "metabase/visualizations/types";@@ -66,195 +66,75 @@ export const translateContentString: TranslateContentStringFunction = (return msgstr;};-export type ColumnDisplayNamePattern = (value: string) => string;-/**- * Patterns for column display names.- * These must match the patterns used in the backend:- * - Aggregations: metabase.lib.aggregation- * - Binning: metabase.lib.binning- * - Temporal buckets: metabase.lib.temporal_bucket+ * Translates a column display name by parsing it into translatable and static+ * parts, translating only the translatable parts, and reassembling.*- * Each pattern is a function that takes a column name and returns the full display name.- * More specific patterns must come before less specific ones.- */-const COLUMN_DISPLAY_NAME_PATTERNS: ColumnDisplayNamePattern[] = [- // Aggregation patterns (from metabase.lib.aggregation)- // More specific patterns must come first- (value: string) => t`Sum of ${value} matching condition`,- (value: string) => t`Average of ${value}`,- (value: string) => t`Count of ${value}`,- (value: string) => t`Cumulative count of ${value}`,- (value: string) => t`Cumulative sum of ${value}`,- (value: string) => t`Distinct values of ${value}`,- (value: string) => t`Max of ${value}`,- (value: string) => t`Median of ${value}`,- (value: string) => t`Min of ${value}`,- (value: string) => t`Standard deviation of ${value}`,- (value: string) => t`Sum of ${value}`,- (value: string) => t`Variance of ${value}`,-- // Binning patterns (from metabase.lib.binning)- // Auto binned (default strategy)- (value: string) => t`${value}: Auto binned`,- // Numeric binning strategies: num-bins (10, 50, 100)- (value: string) => `${value}: 10 bins`,- (value: string) => `${value}: 50 bins`,- (value: string) => `${value}: 100 bins`,- // Coordinate binning strategies: bin-width with degree symbol- (value: string) => `${value}: 0.1°`,- (value: string) => `${value}: 1°`,- (value: string) => `${value}: 10°`,- (value: string) => `${value}: 20°`,- (value: string) => `${value}: 0.05°`,- (value: string) => `${value}: 0.01°`,- (value: string) => `${value}: 0.005°`,-- // Temporal bucket patterns (from metabase.lib.temporal_bucket)- // Generated dynamically using the same Lib functions the backend uses,- // ensuring the translated suffixes match (e.g., "Month" → "Monat" in German)- ...Lib.availableTemporalUnits().map(- (unit) => (value: string) => `${value}: ${Lib.describeTemporalUnit(unit)}`,- ),-];--// Unique marker to find where the value placeholder is in a pattern-const VALUE_MARKER = "\u0000";--/**- * Translates a column display name by recursively parsing known patterns- * (aggregations, binning, temporal buckets) and translating the inner column name.+ * Parsing is done on the CLJ side via `Lib.parseColumnDisplayNameParts` which+ * handles aggregations, joins, implicit joins, temporal buckets, filters,+ * compound filters, binning, and RTL/wrapped locale patterns.*- * Handles patterns where the value can be:- * - At the start: "{value} של סכום" (Hebrew, right-to-left)- * - At the end: "Sum of {value}" (English)- * - Wrapped: "Somme de {value} totale" (hypothetical)+ * If parsing yields no actual translations (e.g. the column name itself has no+ * entry in the dictionary), falls back to translating the whole string via tc().*- * Examples:- * - "Total" => tc("Total") (no pattern matched)- * - "Sum of Total" => t`Sum of ${tc("Total")}`- * - "Sum of Min of Total" => t`Sum of ${t`Min of ${tc("Total")}`}`- * - "Created At: Month" => t`${tc("Created At")}: Month`- * - "Total: Auto binned" => t`${tc("Total")}: Auto binned`+ * The `locale` field used for caching on the CLJS side+ *+ * @example+ * translateColumnDisplayName({ displayName: "Sum of Total", tc, locale: "en" })+ * // => "Sum of " + tc("Total")+ * translateColumnDisplayName({ displayName: "Products → Created At: Month", tc, locale: "en" })+ * // => tc("Products") + " → " + tc("Created At") + ": " + "Month"*/-// Separator used for binning and temporal bucket suffixes (e.g., "Total: Day", "Total: 10 bins")-const COLON_SEPARATOR = ": ";--// Separator used for joined table column names (e.g., "Products → Created At")-// See: src/metabase/lib/field.cljc - field-display-name-add-fk-or-join-display-name-const JOIN_SEPARATOR = " → ";--// Separator used for implicit join aliases (e.g., "People - Product")-// See: src/metabase/lib/join.cljc - standard-join-name-const IMPLICIT_JOIN_SEPARATOR = " - ";--export const translateColumnDisplayName = (- displayName: string,- tc: ContentTranslationFunction,- patterns: ColumnDisplayNamePattern[] = COLUMN_DISPLAY_NAME_PATTERNS,-): string => {+export const translateColumnDisplayName = ({+ displayName,+ tc,+ locale,+}: {+ displayName: string;+ tc: ContentTranslationFunction;+ locale: string;+}): string => {if (!hasTranslations(tc)) {return displayName;}- for (const pattern of patterns) {- const withMarker = pattern(VALUE_MARKER);- const markerIndex = withMarker.indexOf(VALUE_MARKER);-- const prefix = withMarker.substring(0, markerIndex);- const suffix = withMarker.substring(markerIndex + VALUE_MARKER.length);-- const hasPrefix = displayName.startsWith(prefix);- const hasSuffix = displayName.endsWith(suffix);+ const parts = Lib.parseColumnDisplayNameParts(displayName, locale);- if (hasPrefix && hasSuffix && (prefix || suffix)) {- const innerStart = prefix.length;- const innerEnd = displayName.length - suffix.length;+ let anyTranslated = false;+ const translated = parts.map((part) => {+ if (part.type === "translatable") {+ const result = tc(part.value);- if (innerStart <= innerEnd) {- const innerPart = displayName.substring(innerStart, innerEnd);-- return pattern(translateColumnDisplayName(innerPart, tc, patterns));+ if (result !== part.value) {+ anyTranslated = true;}- }- }-- // Handle colon-separated patterns for backend-translated temporal bucket suffixes- // (e.g., "Created At: Monat" where "Monat" is already translated by the backend).- // Explicit binning patterns are already handled above in COLUMN_DISPLAY_NAME_PATTERNS.- const colonIndex = displayName.lastIndexOf(COLON_SEPARATOR);- if (colonIndex > 0) {- const columnPart = displayName.substring(0, colonIndex);- const suffixPart = displayName.substring(- colonIndex + COLON_SEPARATOR.length,- );-- // Only split if the column part actually has a translation.- // This avoids incorrectly splitting column names that contain ": " literally.- const translatedColumn = translateColumnDisplayName(- columnPart,- tc,- patterns,- );- if (translatedColumn !== columnPart) {- return translatedColumn + COLON_SEPARATOR + suffixPart;- }- }-- // Handle joined table column names like "Products → Created At"- // or nested joins like "Orders → Products → Created At: Monat"- // We split on the FIRST arrow to preserve nested patterns in the column part.- const arrowIndex = displayName.indexOf(JOIN_SEPARATOR);- if (arrowIndex > 0) {- const joinAliasPart = displayName.substring(0, arrowIndex);- const columnPart = displayName.substring(- arrowIndex + JOIN_SEPARATOR.length,- );-- // The join alias may contain an implicit join separator " - " (e.g., "People - Product")- // which combines the joined table name and the FK field name.- // We only split on " - " here (within the arrow context) to avoid incorrectly- // splitting question names or other strings that contain dashes.- const dashIndex = joinAliasPart.indexOf(IMPLICIT_JOIN_SEPARATOR);- let translatedJoinAlias: string;- if (dashIndex > 0) {- const tablePart = joinAliasPart.substring(0, dashIndex);- const fkPart = joinAliasPart.substring(- dashIndex + IMPLICIT_JOIN_SEPARATOR.length,- );- translatedJoinAlias =- translateColumnDisplayName(tablePart, tc, patterns) +- IMPLICIT_JOIN_SEPARATOR +- translateColumnDisplayName(fkPart, tc, patterns);- } else {- translatedJoinAlias = translateColumnDisplayName(- joinAliasPart,- tc,- patterns,- );+ return result;}- // columnPart may have more patterns (arrows, colons, aggregations)- return (- translatedJoinAlias +- JOIN_SEPARATOR +- translateColumnDisplayName(columnPart, tc, patterns)- );- }+ return part.value;+ });- return tc(displayName);+ // Fall back to translating the whole string if no part was individually+ // translated — covers mis-parsing or simply missing dictionary entries.+ return anyTranslated ? translated.join("") : tc(displayName);};const isRecord = (obj: unknown): obj is Record<string, unknown> =>_.isObject(obj) && Object.keys(obj).every((key) => typeof key === "string");/** Walk through obj and translate any display name fields */-export const translateDisplayNames = <T>(- obj: T,- tc: ContentTranslationFunction,+export const translateDisplayNames = <T>({+ obj,+ tc,+ locale,fieldsToTranslate = ["display_name", "displayName"],-): T => {+}: {+ obj: T;+ tc: ContentTranslationFunction;+ locale: string;+ fieldsToTranslate?: string[];+}): T => {if (!hasTranslations(tc)) {return obj;}@@ -276,7 +156,11 @@ export const translateDisplayNames = <T>(// As the solution, we always try to translate the display name using pattern matching,// and inside `translateColumnDisplayName` we fallback to regular tc() call if no pattern is matched.const newValue = shouldTranslate- ? translateColumnDisplayName(value as string, tc)+ ? translateColumnDisplayName({+ displayName: value as string,+ tc,+ locale,+ }): traverse(value as T);return I.assoc(acc, key, newValue);@@ -409,11 +293,17 @@ export const translateCardNames = (export const useTranslateSeries = (series: Series) => {const tc = useTranslateContent();+ const { locale } = useLocale();+return useMemo(() => {if (!hasTranslations(tc)) {return series;}- const withTranslatedDisplayNames = translateDisplayNames(series, tc);+ const withTranslatedDisplayNames = translateDisplayNames({+ obj: series,+ tc,+ locale,+ });const withTranslatedCardNames = translateCardNames(withTranslatedDisplayNames,@@ -427,7 +317,7 @@ export const useTranslateSeries = (series: Series) => {}return translateFieldValuesInSeries(withTranslatedCardNames, tc);- }, [series, tc]);+ }, [series, tc, locale]);};/** Returns a function that can be used to sort user-generated strings in andiff --git a/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/content_translation/utils.unit.spec.tsindex 7fa394fdb77..e23c795293d 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@@ -315,19 +315,21 @@ describe("translateColumnDisplayName", () => {};it("should return displayName unchanged when tc has no translations", () => {- const result = translateColumnDisplayName(- "Sum of Total",- mockTranslateWithoutTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Sum of Total",+ tc: mockTranslateWithoutTranslations,+ locale: "en",+ });expect(result).toBe("Sum of Total");});it("should translate a simple column name without aggregation pattern", () => {- const result = translateColumnDisplayName(- "Total",- tcWithColumnTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Total",+ tc: tcWithColumnTranslations,+ locale: "en",+ });expect(result).toBe("Gesamtsumme");});@@ -351,10 +353,11 @@ describe("translateColumnDisplayName", () => {])("should translate column name inside aggregation pattern: %s -> %s",(input, expected) => {- const result = translateColumnDisplayName(- input,- tcWithColumnTranslations,- );+ const result = translateColumnDisplayName({+ displayName: input,+ tc: tcWithColumnTranslations,+ locale: "en",+ });expect(result).toBe(expected);},);@@ -363,83 +366,32 @@ describe("translateColumnDisplayName", () => {["Sum of Min of Total", "Sum of Min of Gesamtsumme"],["Average of Sum of Min of Price", "Average of Sum of Min of Preis"],])("should handle nested aggregations: %s -> %s", (input, expected) => {- const result = translateColumnDisplayName(input, tcWithColumnTranslations);+ const result = translateColumnDisplayName({+ displayName: input,+ tc: tcWithColumnTranslations,+ locale: "en",+ });expect(result).toBe(expected);});it("should return original string when column name has no translation", () => {- const result = translateColumnDisplayName(- "Sum of UnknownColumn",- tcWithColumnTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Sum of UnknownColumn",+ tc: tcWithColumnTranslations,+ locale: "en",+ });expect(result).toBe("Sum of UnknownColumn");});it("should handle empty string", () => {- const result = translateColumnDisplayName("", tcWithColumnTranslations);-- expect(result).toBe("");- });-- describe("RTL and wrapped patterns", () => {- // RTL pattern: value comes first, then the aggregation text- // e.g., Hebrew: "{value} של סכום" (Sum of {value})- const rtlPatterns = [(value: string) => `${value} של סכום`];-- // Wrapped pattern: value is surrounded by prefix and suffix- // e.g., hypothetical French: "Somme de {value} totale"- const wrappedPatterns = [(value: string) => `Somme de ${value} totale`];-- it("should handle RTL patterns where value comes first", () => {- const result = translateColumnDisplayName(- "Total של סכום",- tcWithColumnTranslations,- rtlPatterns,- );-- expect(result).toBe("Gesamtsumme של סכום");+ const result = translateColumnDisplayName({+ displayName: "",+ tc: tcWithColumnTranslations,+ locale: "en",});- it("should handle wrapped patterns where value is in the middle", () => {- const result = translateColumnDisplayName(- "Somme de Total totale",- tcWithColumnTranslations,- wrappedPatterns,- );-- expect(result).toBe("Somme de Gesamtsumme totale");- });-- it("should handle nested RTL patterns", () => {- const nestedRtlPatterns = [- (value: string) => `${value} של סכום`,- (value: string) => `${value} של מינימום`,- ];-- const result = translateColumnDisplayName(- "Total של מינימום של סכום",- tcWithColumnTranslations,- nestedRtlPatterns,- );-- expect(result).toBe("Gesamtsumme של מינימום של סכום");- });-- it("should handle nested wrapped patterns", () => {- const nestedWrappedPatterns = [- (value: string) => `Somme de ${value} totale`,- (value: string) => `Minimum de ${value} local`,- ];-- const result = translateColumnDisplayName(- "Somme de Minimum de Total local totale",- tcWithColumnTranslations,- nestedWrappedPatterns,- );-- expect(result).toBe("Somme de Minimum de Gesamtsumme local totale");- });+ expect(result).toBe("");});describe("binning patterns", () => {@@ -455,10 +407,11 @@ describe("translateColumnDisplayName", () => {])("should translate column name inside binning pattern: %s -> %s",(input, expected) => {- const result = translateColumnDisplayName(- input,- tcWithColumnTranslations,- );+ const result = translateColumnDisplayName({+ displayName: input,+ tc: tcWithColumnTranslations,+ locale: "en",+ });expect(result).toBe(expected);},);@@ -484,19 +437,21 @@ describe("translateColumnDisplayName", () => {])("should translate column name inside temporal bucket pattern: %s -> %s",(input, expected) => {- const result = translateColumnDisplayName(- input,- tcWithColumnTranslations,- );+ const result = translateColumnDisplayName({+ displayName: input,+ tc: tcWithColumnTranslations,+ locale: "en",+ });expect(result).toBe(expected);},);it("should handle combined aggregation and temporal bucket patterns", () => {- const result = translateColumnDisplayName(- "Sum of Total: Month",- tcWithColumnTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Sum of Total: Month",+ tc: tcWithColumnTranslations,+ locale: "en",+ });expect(result).toBe("Sum of Gesamtsumme: Month");});});@@ -513,20 +468,22 @@ describe("translateColumnDisplayName", () => {return typeof str === "string" ? (translations[str] ?? str) : str;};- const result = translateColumnDisplayName(- "Note: Important",- tcWithColonColumn,- );+ const result = translateColumnDisplayName({+ displayName: "Note: Important",+ tc: tcWithColonColumn,+ locale: "en",+ });expect(result).toBe("Notiz: Wichtig");});it("should split on colon and translate column if column has a translation", () => {// This handles backend-translated temporal bucket suffixes like "Monat", "Tag", etc.// where the suffix is already translated by the backend- const result = translateColumnDisplayName(- "Total: SomeRandomSuffix",- tcWithColumnTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Total: SomeRandomSuffix",+ tc: tcWithColumnTranslations,+ locale: "en",+ });// "Total" has a translation, so it splits and translates the column partexpect(result).toBe("Gesamtsumme: SomeRandomSuffix");});@@ -534,10 +491,11 @@ describe("translateColumnDisplayName", () => {it("should handle backend-translated temporal bucket suffixes", () => {// The backend translates temporal unit names (e.g., "Month" -> "Monat" in German)// before the FE receives them. This test verifies that we still translate the column part.- const result = translateColumnDisplayName(- "Total: Monat", // German for "Month" - already translated by backend- tcWithColumnTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Total: Monat", // German for "Month" - already translated by backend+ tc: tcWithColumnTranslations,+ locale: "en",+ });expect(result).toBe("Gesamtsumme: Monat");});});@@ -563,43 +521,48 @@ describe("translateColumnDisplayName", () => {])("should translate joined table column names: %s -> %s",(input, expected) => {- const result = translateColumnDisplayName(- input,- tcWithJoinTranslations,- );+ const result = translateColumnDisplayName({+ displayName: input,+ tc: tcWithJoinTranslations,+ locale: "en",+ });expect(result).toBe(expected);},);it("should translate joined table with temporal bucket", () => {- const result = translateColumnDisplayName(- "Products → Created At: Month",- tcWithJoinTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Products → Created At: Month",+ tc: tcWithJoinTranslations,+ locale: "en",+ });expect(result).toBe("Produkte → Erstellt am: Month");});it("should translate joined table with aggregation pattern", () => {- const result = translateColumnDisplayName(- "Distinct values of Products → Total",- tcWithJoinTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Distinct values of Products → Total",+ tc: tcWithJoinTranslations,+ locale: "en",+ });expect(result).toBe("Distinct values of Produkte → Gesamtsumme");});it("should translate complex nested pattern with join, aggregation, and temporal bucket", () => {- const result = translateColumnDisplayName(- "Distinct values of Products → Created At: Month",- tcWithJoinTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Distinct values of Products → Created At: Month",+ tc: tcWithJoinTranslations,+ locale: "en",+ });expect(result).toBe("Distinct values of Produkte → Erstellt am: Month");});it("should handle nested joins with temporal bucket", () => {- const result = translateColumnDisplayName(- "Orders → Products → Created At: Month",- tcWithJoinTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "Orders → Products → Created At: Month",+ tc: tcWithJoinTranslations,+ locale: "en",+ });expect(result).toBe("Bestellungen → Produkte → Erstellt am: Month");});@@ -611,7 +574,7 @@ describe("translateColumnDisplayName", () => {const translations: Record<string, string> = {Total: "Gesamtsumme",Products: "Produkte",- Product: "Produkt", // Singular form used in FK names+ Product: "Produkt",Orders: "Bestellungen",People: "Personen","Created At": "Erstellt am",@@ -622,26 +585,30 @@ describe("translateColumnDisplayName", () => {it("should translate implicit join alias with dash separator", () => {// "People - Product → Created At" has implicit join alias "People - Product"- const result = translateColumnDisplayName(- "People - Product → Created At",- tcWithImplicitJoinTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "People - Product → Created At",+ tc: tcWithImplicitJoinTranslations,+ locale: "en",+ });expect(result).toBe("Personen - Produkt → Erstellt am");});it("should translate implicit join with temporal bucket", () => {- const result = translateColumnDisplayName(- "People - Product → Created At: Month",- tcWithImplicitJoinTranslations,- );+ const result = translateColumnDisplayName({+ displayName: "People - Product → Created At: Month",+ tc: tcWithImplicitJoinTranslations,+ locale: "en",+ });expect(result).toBe("Personen - Produkt → Erstellt am: Month");});it("should translate aggregation with implicit join and temporal bucket", () => {- const result = translateColumnDisplayName(- "Distinct values of People - Product → Created At: Month",- tcWithImplicitJoinTranslations,- );+ const result = translateColumnDisplayName({+ displayName:+ "Distinct values of People - Product → Created At: Month",+ tc: tcWithImplicitJoinTranslations,+ locale: "en",+ });expect(result).toBe("Distinct values of Personen - Produkt → Erstellt am: Month",);@@ -656,12 +623,78 @@ describe("translateColumnDisplayName", () => {return typeof str === "string" ? (translations[str] ?? str) : str;};- const result = translateColumnDisplayName(- "My Question - Part 2",- tcWithQuestionName,- );+ const result = translateColumnDisplayName({+ displayName: "My Question - Part 2",+ tc: tcWithQuestionName,+ locale: "en",+ });expect(result).toBe("Meine Frage - Teil 2");});});});++ describe("filter display name patterns", () => {+ const tcWithFilterTranslations: ContentTranslationFunction = (str) => {+ const translations: Record<string, string> = {+ Total: "Gesamtsumme",+ Price: "Preis",+ "Created At": "Erstellt am",+ Products: "Produkte",+ Status: "Status",+ "Review Requested At": "Überprüfung angefordert am",+ "Reviewed At": "Überprüft am",+ Category: "Kategorie",+ };++ return typeof str === "string" ? (translations[str] ?? str) : str;+ };++ it.each([+ ["Total is greater than 100", "Gesamtsumme is greater than 100"],+ [+ "Created At is in the previous 3 months",+ "Erstellt am is in the previous 3 months",+ ],+ ["Status is Active", "Status is Active"],+ ["Price is between 10 and 100", "Preis is between 10 and 100"],+ ["Total is empty", "Gesamtsumme is empty"],+ ["Total is not empty", "Gesamtsumme is not empty"],+ ["Status contains Active", "Status contains Active"],+ [+ "Sum of Total is greater than 100",+ "Sum of Gesamtsumme is greater than 100",+ ],+ [+ "Products → Price is greater than 50",+ "Produkte → Preis is greater than 50",+ ],+ ["Created At: Month is today", "Erstellt am: Month is today"],+ [+ "Unknown Column is greater than 100",+ "Unknown Column is greater than 100",+ ],+ [+ "Review Requested At is not empty or Reviewed At is not empty",+ "Überprüfung angefordert am is not empty or Überprüft am is not empty",+ ],+ [+ "Total is empty, Price is empty, and Status is empty",+ "Gesamtsumme is empty, Preis is empty, and Status is empty",+ ],+ [+ "Total is empty, Price is empty, Status is empty, and Category is empty",+ "Gesamtsumme is empty, Preis is empty, Status is empty, and Kategorie is empty",+ ],+ ])(+ "should translate column name in filter: %s -> %s",+ (input, expected) => {+ const result = translateColumnDisplayName({+ displayName: input,+ tc: tcWithFilterTranslations,+ locale: "en",+ });+ expect(result).toBe(expected);+ },+ );+ });});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.tsxindex dd1b5c4b8f7..e947fdb7540 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 { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";@@ -21,15 +22,17 @@ export const BreakoutBadgeListInner = ({}) => {const breakoutItems = useBreakoutData();const tc = useTranslateContent();+ const { locale } = useLocale();return (<BadgeListitems={breakoutItems.map((item) => ({item,- name: PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- item.longDisplayName,+ name: PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: item.longDisplayName,tc,- ),+ locale,+ }),}))}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.tsxindex 48f7a12d033..b9698375e53 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 { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import { Group, Popover } from "metabase/ui";@@ -18,6 +19,7 @@ const DropdownFilterBadgeListContent = ({} & FilterProps) => {const [opened, { open, close }] = useDisclosure(false);const tc = useTranslateContent();+ const { locale } = useLocale();return (<Popover opened={opened} onClose={close}>@@ -25,10 +27,11 @@ const DropdownFilterBadgeListContent = ({<BadgeListItemonClick={open}onRemoveItem={() => item.onRemoveFilter()}- name={PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- item.displayName,+ name={PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: item.displayName,tc,- )}+ locale,+ })}/></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.tsxindex 2840f71ece2..55f7f3eaa1b 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 { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";@@ -19,16 +20,18 @@ export const FilterBadgeList = ({}) => {const filterItems = useFilterData();const tc = useTranslateContent();+ const { locale } = useLocale();return (<BadgeListaddButtonLabel={t`Add another filter`}items={filterItems.map((item) => ({item,- name: PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- item.displayName,+ name: PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: item.displayName,tc,- ),+ locale,+ }),}))}onAddItem={onAddItem}onSelectItem={onSelectItem}diff --git a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/use-summarize-data.ts b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/use-summarize-data.tsindex dfb89ad576e..3b89b09e782 100644--- a/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/use-summarize-data.ts+++ b/frontend/src/embedding-sdk-bundle/components/private/SdkQuestion/components/Summarize/use-summarize-data.ts@@ -1,5 +1,6 @@import { useCallback, useMemo } from "react";+import { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import {@@ -18,6 +19,7 @@ export interface SDKAggregationItem extends AggregationItem {export const useSummarizeData = () => {const { question, updateQuestion } = useSdkQuestionContext();const tc = useTranslateContent();+ const { locale } = useLocale();const query = question?.query();const stageIndex = -1;@@ -59,16 +61,17 @@ export const useSummarizeData = () => {return {...aggregationItem,displayName:- PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- aggregationItem.displayName,+ PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: aggregationItem.displayName,tc,- ),+ locale,+ }),onRemoveAggregation,onUpdateAggregation,};}): [],- [onQueryChange, query, stageIndex, tc],+ [onQueryChange, query, stageIndex, tc, locale],);return aggregationItems;diff --git a/frontend/src/metabase-lib/display_name.ts b/frontend/src/metabase-lib/display_name.tsnew file mode 100644index 00000000000..1c152c3f400--- /dev/null+++ b/frontend/src/metabase-lib/display_name.ts@@ -0,0 +1,13 @@+import * as ML from "cljs/metabase.lib.js";++export interface DisplayNamePart {+ type: "static" | "translatable";+ value: string;+}++export function parseColumnDisplayNameParts(+ displayName: string,+ locale: string,+): DisplayNamePart[] {+ return ML.parse_column_display_name_parts(displayName, locale);+}diff --git a/frontend/src/metabase-lib/index.ts b/frontend/src/metabase-lib/index.tsindex dce97293760..3cf24c279f1 100644--- a/frontend/src/metabase-lib/index.ts+++ b/frontend/src/metabase-lib/index.ts@@ -7,6 +7,7 @@ export * from "./buckets";export * from "./column_types";export * from "./comparison";export * from "./database";+export * from "./display_name";export * from "./drills";export * from "./expression";export * from "./extractions";diff --git a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsxindex 5690f4ab27c..4ccfffb6756 100644--- a/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx+++ b/frontend/src/metabase/common/components/QueryColumnPicker/QueryColumnPicker.tsx@@ -10,6 +10,7 @@ import {HoverParent,QueryColumnInfoIcon,} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";+import { useLocale } from "metabase/common/hooks";import { getColumnGroupIcon } from "metabase/common/utils/column-groups";import { useTranslateContent } from "metabase/i18n/hooks";import type { ColorName } from "metabase/lib/colors/types";@@ -103,6 +104,7 @@ export function QueryColumnPicker({disableSearch,}: QueryColumnPickerProps) {const tc = useTranslateContent();+ const { locale } = useLocale();const withCustomExpressions = onSelectExpression != null;const [isSearching, setIsSearching] = useState(false);@@ -321,11 +323,12 @@ export function QueryColumnPicker({(item: Item) =>isSearching? item.displayName- : PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- item.displayName,+ : PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: item.displayName,tc,- ),- [tc, isSearching],+ locale,+ }),+ [tc, locale, isSearching],);return (diff --git a/frontend/src/metabase/plugins/oss/content-translation.ts b/frontend/src/metabase/plugins/oss/content-translation.tsindex 1a4acaab497..f3110756161 100644--- a/frontend/src/metabase/plugins/oss/content-translation.ts+++ b/frontend/src/metabase/plugins/oss/content-translation.ts@@ -17,14 +17,20 @@ const getDefaultPluginContentTranslation = () => ({>(): ContentTranslationFunction => {return useCallback(<U = T>(arg: U) => arg, []);},- translateDisplayNames: <T extends object>(- obj: T,- _tc: ContentTranslationFunction,- ) => obj,- translateColumnDisplayName: (- displayName: string,- _tc: ContentTranslationFunction,- ): string => displayName,+ translateDisplayNames: <T extends object>({+ obj,+ }: {+ obj: T;+ tc: ContentTranslationFunction;+ locale: string;+ }) => obj,+ translateColumnDisplayName: ({+ displayName,+ }: {+ displayName: string;+ tc: ContentTranslationFunction;+ locale: string;+ }): string => displayName,useTranslateFieldValuesInHoveredObject: (obj?: HoveredObject | null) => obj,useTranslateSeries: (obj: Series) => obj,useSortByContentTranslation: () => (a: string, b: string) =>diff --git a/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsx b/frontend/src/metabase/querying/filters/components/FilterPanel/FilterPanelPopover/FilterPanelPopover.tsxindex d358d89c576..a03363fdae7 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,6 @@import { useMemo, useState } from "react";+import { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { FilterPicker } from "metabase/querying/filters/components/FilterPicker";import { getTranslatedFilterDisplayName } from "metabase/querying/filters/utils/display";@@ -25,10 +26,11 @@ export function FilterPanelPopover({}: FilterPanelPopoverProps) {const [isOpened, setIsOpened] = useState(false);const tc = useTranslateContent();+ const { locale } = useLocale();const translatedFilterName = useMemo(- () => getTranslatedFilterDisplayName(query, stageIndex, filter, tc),- [query, stageIndex, filter, tc],+ () => getTranslatedFilterDisplayName(query, stageIndex, filter, tc, locale),+ [query, stageIndex, filter, tc, locale],);const handleChange = (newFilter: Lib.Clause | Lib.SegmentMetadata) => {diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsxindex 975b8e66fc7..97f7e7e98b2 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/DateFilterPicker/DateFilterPicker.tsx@@ -1,5 +1,6 @@import { useMemo } from "react";+import { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import { DatePicker } from "metabase/querying/common/components/DatePicker";@@ -24,6 +25,7 @@ export function DateFilterPicker({readOnly,}: FilterPickerWidgetProps) {const tc = useTranslateContent();+ const { locale } = useLocale();const columnInfo = useMemo(() => {return Lib.displayInfo(query, stageIndex, column);@@ -71,10 +73,11 @@ export function DateFilterPicker({disabled={readOnly}withArrow={!readOnly}>- {PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- columnInfo.longDisplayName,+ {PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: columnInfo.longDisplayName,tc,- )}+ locale,+ })}</PopoverBackButton>) : null}diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsxindex 3b59c42cee8..b2bcbe171cd 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterColumnPicker/FilterColumnPicker.tsx@@ -10,6 +10,7 @@ import {HoverParent,QueryColumnInfoIcon,} from "metabase/common/components/MetadataInfo/ColumnInfoIcon";+import { useLocale } from "metabase/common/hooks";import { getColumnGroupIcon } from "metabase/common/utils/column-groups";import { useTranslateContent } from "metabase/i18n/hooks";import { isNotNull } from "metabase/lib/types";@@ -86,6 +87,7 @@ export function FilterColumnPicker({withColumnItemIcon = true,}: FilterColumnPickerProps) {const tc = useTranslateContent();+ const { locale } = useLocale();const [searchText, setSearchText] = useState("");const isSearching = searchText !== "";@@ -114,11 +116,12 @@ export function FilterColumnPicker({searchText? // When searching, show the untranslated display name to match the search textitem.displayName- : PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- item.displayName,+ : PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: item.displayName,tc,- ),- [tc, searchText],+ locale,+ }),+ [tc, locale, searchText],);const handleSectionChange = (section: Section) => {diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/FilterPickerHeader/FilterPickerHeader.tsxindex acf8dac5687..ac731b5abcd 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 { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import { Flex, PopoverBackButton } from "metabase/ui";@@ -18,6 +19,7 @@ export function FilterPickerHeader({onBack,}: FilterPickerHeaderProps) {const tc = useTranslateContent();+ const { locale } = useLocale();return (<Flex px="md" pt="md" justify="space-between">{onBack && (@@ -27,10 +29,11 @@ export function FilterPickerHeader({disabled={readOnly}withArrow={!readOnly}>- {PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- columnName,+ {PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: columnName,tc,- )}+ locale,+ })}</PopoverBackButton>)}{children}diff --git a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsxindex f5a44558aab..884deda638e 100644--- a/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx+++ b/frontend/src/metabase/querying/filters/components/FilterPicker/TimeFilterPicker/TimeFilterPicker.unit.spec.tsx@@ -1,7 +1,7 @@import _userEvent from "@testing-library/user-event";import dayjs from "dayjs";-import { render, screen, within } from "__support__/ui";+import { renderWithProviders, screen, within } from "__support__/ui";import { checkNotNull } from "metabase/lib/types";import * as Lib from "metabase-lib";@@ -48,7 +48,7 @@ function setup({const onChange = jest.fn();const onBack = jest.fn();- render(+ renderWithProviders(<TimeFilterPickerautoFocusquery={query}diff --git a/frontend/src/metabase/querying/filters/utils/display.ts b/frontend/src/metabase/querying/filters/utils/display.tsindex 640e4bdb0b2..db6d3a11e52 100644--- a/frontend/src/metabase/querying/filters/utils/display.ts+++ b/frontend/src/metabase/querying/filters/utils/display.ts@@ -7,11 +7,13 @@ export const getTranslatedFilterDisplayName = (stageIndex: number,filter: Lib.FilterClause,tc: ContentTranslationFunction,+ locale: string,): string => {const displayInfo = Lib.displayInfo(query, stageIndex, filter);- return PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- displayInfo.longDisplayName,+ return PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: displayInfo.longDisplayName,tc,- );+ locale,+ });};diff --git a/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsx b/frontend/src/metabase/querying/notebook/components/AggregateStep/AggregateStep.tsxindex b7e38627abd..46d7ab08a03 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 { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import * as Lib from "metabase-lib";@@ -20,6 +21,7 @@ export function AggregateStep({const { question, stageIndex } = step;const isMetric = question.type() === "metric";const tc = useTranslateContent();+ const { locale } = useLocale();const aggregations = useMemo(() => {return Lib.aggregations(query, stageIndex);@@ -47,10 +49,12 @@ export function AggregateStep({};const renderAggregationName = (aggregation: Lib.AggregationClause) =>- PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- Lib.displayInfo(query, stageIndex, aggregation).longDisplayName,+ PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: Lib.displayInfo(query, stageIndex, aggregation)+ .longDisplayName,tc,- );+ locale,+ });return (<ClauseStepdiff --git a/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsx b/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.tsxindex 93248c80bda..411eb178939 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 { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import * as Lib from "metabase-lib";@@ -20,6 +21,7 @@ export function BreakoutStep({const { question, stageIndex } = step;const isMetric = question.type() === "metric";const tc = useTranslateContent();+ const { locale } = useLocale();const breakouts = useMemo(() => Lib.breakouts(query, stageIndex),@@ -36,10 +38,11 @@ export function BreakoutStep({const isAddButtonDisabled = isMetric && metricColumns.length === 0;const renderBreakoutName = (clause: Lib.BreakoutClause) =>- PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- Lib.displayInfo(query, stageIndex, clause).longDisplayName,+ PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: Lib.displayInfo(query, stageIndex, clause).longDisplayName,tc,- );+ locale,+ });const handleAddBreakout = (column: Lib.ColumnMetadata) => {const nextQuery = Lib.breakout(query, stageIndex, column);diff --git a/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.unit.spec.tsxindex 2178a1eb075..44d22e62b30 100644--- a/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/BreakoutStep/BreakoutStep.unit.spec.tsx@@ -5,7 +5,7 @@ import {fireEvent,getIcon,queryIcon,- render,+ renderWithProviders,screen,within,} from "__support__/ui";@@ -98,7 +98,7 @@ interface SetupOpts {function setup({ step = createMockNotebookStep(), readOnly }: SetupOpts = {}) {const updateQuery = jest.fn();- render(+ renderWithProviders(<BreakoutStepstep={step}stageIndex={step.stageIndex}diff --git a/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx b/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsxindex 877bb768e03..dd4080fb7cb 100644--- a/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx+++ b/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.tsx@@ -3,6 +3,7 @@ import { t } from "ttag";import _ from "underscore";import ErrorBoundary from "metabase/ErrorBoundary";+import { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { FilterPicker } from "metabase/querying/filters/components/FilterPicker";import { getTranslatedFilterDisplayName } from "metabase/querying/filters/utils/display";@@ -21,6 +22,7 @@ export function FilterStep({}: NotebookStepProps) {const { stageIndex } = step;const tc = useTranslateContent();+ const { locale } = useLocale();const filters = useMemo(() => Lib.filters(query, stageIndex),@@ -30,9 +32,9 @@ export function FilterStep({const renderFilterName = useMemo(() =>_.memoize((filter: Lib.FilterClause) =>- getTranslatedFilterDisplayName(query, stageIndex, filter, tc),+ getTranslatedFilterDisplayName(query, stageIndex, filter, tc, locale),),- [query, stageIndex, tc],+ [query, stageIndex, tc, locale],);const handleAddFilter = (clause: Lib.Filterable) => {diff --git a/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.unit.spec.tsxindex ac70db1e444..549d32a416c 100644--- a/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/FilterStep/FilterStep.unit.spec.tsx@@ -1,4 +1,4 @@-import { render, screen } from "__support__/ui";+import { renderWithProviders, screen } from "__support__/ui";import * as Lib from "metabase-lib";import { columnFinder, createQuery } from "metabase-lib/test-helpers";@@ -20,7 +20,7 @@ function createQueryWithFilter() {function setup(step = createMockNotebookStep()) {const updateQuery = jest.fn();- render(+ renderWithProviders(<FilterStepstep={step}stageIndex={step.stageIndex}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.tsxindex bef4f2de8a5..b052028ace6 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 { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import type { ContentTranslationFunction } from "metabase/i18n/types";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";@@ -37,10 +38,11 @@ export const JoinColumnButton = forwardRef(function JoinColumnTarget(ref: Ref<HTMLButtonElement>,) {const tc = useTranslateContent();+ const { locale } = useLocale();const expression = isLhsPicker ? lhsExpression : rhsExpression;const buttonLabel = useMemo(- () => getButtonLabel(query, stageIndex, expression, tc),- [query, stageIndex, expression, tc],+ () => getButtonLabel(query, stageIndex, expression, tc, locale),+ [query, stageIndex, expression, tc, locale],);const isEmpty = expression == null;const isLiteral =@@ -90,6 +92,7 @@ function getButtonLabel(stageIndex: number,expression: Lib.ExpressionClause | undefined,tc: ContentTranslationFunction,+ locale: string,) {if (expression == null) {return t`Pick a column…`;@@ -99,10 +102,11 @@ function getButtonLabel(Lib.isJoinConditionLHSorRHSLiteral(expression) ||Lib.isJoinConditionLHSorRHSColumn(expression)) {- return PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- Lib.displayInfo(query, stageIndex, expression).displayName,+ return PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: Lib.displayInfo(query, stageIndex, expression).displayName,tc,- );+ locale,+ });}return t`Custom expression`;diff --git a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsx b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.tsxindex 4a9b0b29f8c..81ed96b9bae 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 { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { PLUGIN_CONTENT_TRANSLATION } from "metabase/plugins";import { Icon } from "metabase/ui";@@ -173,6 +174,7 @@ function SortDisplayName({disabled,}: SortDisplayNameProps) {const tc = useTranslateContent();+ const { locale } = useLocale();const icon = displayInfo.direction === "asc" ? "arrow_up" : "arrow_down";return (<button@@ -186,10 +188,11 @@ function SortDisplayName({><Icon name={icon} /><span>- {PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName(- displayInfo.longDisplayName,+ {PLUGIN_CONTENT_TRANSLATION.translateColumnDisplayName({+ displayName: displayInfo.longDisplayName,tc,- )}+ locale,+ })}</span></button>);diff --git a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.unit.spec.tsx b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.unit.spec.tsxindex dd02a5e2d65..e42ab90997e 100644--- a/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.unit.spec.tsx+++ b/frontend/src/metabase/querying/notebook/components/SortStep/SortStep.unit.spec.tsx@@ -1,6 +1,11 @@import userEvent from "@testing-library/user-event";-import { getIcon, queryIcon, render, screen } from "__support__/ui";+import {+ getIcon,+ queryIcon,+ renderWithProviders,+ screen,+} from "__support__/ui";import * as Lib from "metabase-lib";import { createQuery } from "metabase-lib/test-helpers";@@ -18,7 +23,7 @@ function createQueryWithOrderBy(direction: Lib.OrderByDirection = "asc") {function setup(step = createMockNotebookStep()) {const updateQuery = jest.fn();- render(+ renderWithProviders(<SortStepstep={step}stageIndex={step.stageIndex}diff --git a/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx b/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsxindex 4dabfeb4b21..91a37790394 100644--- a/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx+++ b/frontend/src/metabase/querying/segments/components/SegmentFilterEditor/SegmentFilterEditor.tsx@@ -3,6 +3,7 @@ import { t } from "ttag";import _ from "underscore";import ErrorBoundary from "metabase/ErrorBoundary";+import { useLocale } from "metabase/common/hooks";import { useTranslateContent } from "metabase/i18n/hooks";import { FilterPicker } from "metabase/querying/filters/components/FilterPicker";import { getTranslatedFilterDisplayName } from "metabase/querying/filters/utils/display";@@ -23,14 +24,15 @@ export function SegmentFilterEditor({readOnly = false,}: SegmentFilterEditorProps) {const tc = useTranslateContent();+ const { locale } = useLocale();const filters = useMemo(() => Lib.filters(query, STAGE_INDEX), [query]);const renderFilterName = useMemo(() =>_.memoize((filter: Lib.FilterClause) =>- getTranslatedFilterDisplayName(query, STAGE_INDEX, filter, tc),+ getTranslatedFilterDisplayName(query, STAGE_INDEX, filter, tc, locale),),- [query, tc],+ [query, tc, locale],);const handleSelectFilter = useCallback(diff --git a/src/metabase/lib/aggregation.cljc b/src/metabase/lib/aggregation.cljcindex 4a96cc05b35..0ad6fb1b5a6 100644--- a/src/metabase/lib/aggregation.cljc+++ b/src/metabase/lib/aggregation.cljc@@ -1,6 +1,7 @@(ns metabase.lib.aggregation(:refer-clojure :exclude [count distinct max min var select-keys mapv empty? not-empty #?(:clj doseq) #?(:clj for)])(:require+ [clojure.string :as str][medley.core :as m][metabase.lib.common :as lib.common][metabase.lib.computed :as lib.computed]@@ -110,6 +111,32 @@[query stage-number ag-ref style](lib.metadata.calculation/display-name query stage-number (resolve-aggregation query stage-number ag-ref) style))+(def ^:private count-aggregation-display-name-fns+ "Map of count aggregation tag to a function that takes the column display name and returns the full aggregation display name."+ {:count (fn [arg] (i18n/tru "Count of {0}" arg))+ :cum-count (fn [arg] (i18n/tru "Cumulative count of {0}" arg))})++(def ^:private count-aggregation-no-arg-display-name-fns+ "Map of count aggregation tag to a function that returns the display name when no argument is provided."+ {:count (fn [] (i18n/tru "Count"))+ :cum-count (fn [] (i18n/tru "Cumulative count"))})++(def ^:private unary-aggregation-display-name-fns+ "Map of aggregation tag to a function that takes the column display name and returns the full aggregation display name."+ {:avg (fn [arg] (i18n/tru "Average of {0}" arg))+ :cum-sum (fn [arg] (i18n/tru "Cumulative sum of {0}" arg))+ :distinct (fn [arg] (i18n/tru "Distinct values of {0}" arg))+ :max (fn [arg] (i18n/tru "Max of {0}" arg))+ :median (fn [arg] (i18n/tru "Median of {0}" arg))+ :min (fn [arg] (i18n/tru "Min of {0}" arg))+ :stddev (fn [arg] (i18n/tru "Standard deviation of {0}" arg))+ :sum (fn [arg] (i18n/tru "Sum of {0}" arg))+ :var (fn [arg] (i18n/tru "Variance of {0}" arg))})++(def ^:private other-aggregation-display-name-fns+ "Map of other aggregation tags to functions that take the column display name and return the full aggregation display name."+ {:sum-where (fn [arg] (i18n/tru "Sum of {0} matching condition" arg))})+(lib.hierarchy/derive ::count-aggregation ::aggregation);;; count and cumulative count can both be used either with no args (count of rows) or with one arg (count of X, which@@ -123,13 +150,9 @@[query stage-number [tag _opts x] style];; x is optional.(if x- (let [x-display-name (lib.metadata.calculation/display-name query stage-number x style)]- (case tag- :count (i18n/tru "Count of {0}" x-display-name)- :cum-count (i18n/tru "Cumulative count of {0}" x-display-name)))- (case tag- :count (i18n/tru "Count")- :cum-count (i18n/tru "Cumulative count"))))+ ((get count-aggregation-display-name-fns tag)+ (lib.metadata.calculation/display-name query stage-number x style))+ ((get count-aggregation-no-arg-display-name-fns tag))))(defmethod lib.metadata.calculation/column-name-method ::count-aggregation[_query _stage-number [tag :as _clause]]@@ -191,22 +214,33 @@:sum "sum":var "var"))+(defn- pattern->prefix-suffix+ "Converts a pattern string like 'Average of {0}' or 'Sum of {0} matching condition'+ into a map with :prefix and :suffix keys."+ [pattern]+ (let [[prefix suffix] (str/split pattern #"\{0\}" 2)]+ {:prefix (clojure.core/str prefix)+ :suffix (clojure.core/str suffix)}))++(defn aggregation-display-name-patterns+ "Returns the list of aggregation display name patterns for content translation.+ Each pattern is a map with :prefix and :suffix keys, generated by splitting+ the display name function result on the {0} placeholder.+ More specific patterns (like 'Sum of X matching condition') come first."+ []+ (-> []+ (into (mapv (fn [[_tag f]] (pattern->prefix-suffix (f "{0}"))) other-aggregation-display-name-fns))+ (into (mapv (fn [[_tag f]] (pattern->prefix-suffix (f "{0}"))) unary-aggregation-display-name-fns))+ (into (mapv (fn [[_tag f]] (pattern->prefix-suffix (f "{0}"))) count-aggregation-display-name-fns))))+(mu/defmethod lib.metadata.calculation/display-name-method ::unary-aggregation[querystage-number[tag _opts arg] :- [:ref ::lib.schema.mbql-clause/clause]style]- (let [arg (lib.metadata.calculation/display-name query stage-number arg style)]- (case tag- :avg (i18n/tru "Average of {0}" arg)- :cum-sum (i18n/tru "Cumulative sum of {0}" arg)- :distinct (i18n/tru "Distinct values of {0}" arg)- :max (i18n/tru "Max of {0}" arg)- :median (i18n/tru "Median of {0}" arg)- :min (i18n/tru "Min of {0}" arg)- :stddev (i18n/tru "Standard deviation of {0}" arg)- :sum (i18n/tru "Sum of {0}" arg)- :var (i18n/tru "Variance of {0}" arg))))+ (let [arg (lib.metadata.calculation/display-name query stage-number arg style)+ display-fn (get unary-aggregation-display-name-fns tag)]+ (display-fn arg)))(defmethod lib.metadata.calculation/display-name-method :percentile[query stage-number [_percentile _opts x p] style]@@ -234,7 +268,8 @@(defmethod lib.metadata.calculation/display-name-method :sum-where[query stage-number [_sum-where _opts x _pred] style]- (i18n/tru "Sum of {0} matching condition" (lib.metadata.calculation/display-name query stage-number x style)))+ ((get other-aggregation-display-name-fns :sum-where)+ (lib.metadata.calculation/display-name query stage-number x style)))(defmethod lib.metadata.calculation/column-name-method :sum-where[query stage-number [_sum-where _opts x _pred]]diff --git a/src/metabase/lib/display_name.cljc b/src/metabase/lib/display_name.cljcnew file mode 100644index 00000000000..aacc972a6fa--- /dev/null+++ b/src/metabase/lib/display_name.cljc@@ -0,0 +1,234 @@+(ns metabase.lib.display-name+ "Utilities for parsing column display names for content translation."+ (:require+ [clojure.string :as str]+ [metabase.util.performance :as perf]))++(def ^:const column-display-name-separator+ "Separator used for temporal bucket and binning suffixes (e.g., 'Total: Month', 'Price: 10 bins')."+ ": ")++(def ^:const join-display-name-separator+ "Separator used for joined table column names (e.g., 'Products → Created At')."+ " → ")++(def ^:const implicit-join-display-name-separator+ "Separator used for implicit join aliases (e.g., 'People - Product')."+ " - ")++(defn- static-part+ "Create a static (non-translatable) part."+ [value]+ {:type :static, :value value})++(defn- translatable-part+ "Create a translatable part."+ [value]+ {:type :translatable, :value value})++(defn- try-parse-aggregation-to-parts+ "Try to parse a display name using aggregation patterns.+ Returns a vector of parts or nil if no pattern matches."+ [display-name patterns]+ (perf/some (fn [{:keys [prefix suffix]}]+ (when (and (str/starts-with? display-name prefix)+ (str/ends-with? display-name suffix)+ ;; Ensure we have a non-empty inner part+ (> (- (count display-name) (count prefix) (count suffix)) 0))+ (let [inner (subs display-name (count prefix) (- (count display-name) (count suffix)))]+ {:matched true+ :prefix prefix+ :suffix suffix+ :inner inner})))+ patterns))++(defn- try-parse-join-to-parts+ "Try to parse a joined column display name.+ Returns {:matched true, :join-alias str, :column str} or nil."+ [display-name]+ (let [arrow-idx (str/index-of display-name join-display-name-separator)]+ (when (and arrow-idx (pos? arrow-idx))+ {:matched true+ :join-alias (subs display-name 0 arrow-idx)+ :column (subs display-name (+ arrow-idx (count join-display-name-separator)))})))++(defn- try-parse-implicit-join-to-parts+ "Try to parse an implicit join alias (e.g., 'People - Product').+ Returns {:matched true, :table str, :fk-field str} or nil."+ [join-alias]+ (let [dash-idx (str/index-of join-alias implicit-join-display-name-separator)]+ (when (and dash-idx (pos? dash-idx))+ {:matched true+ :table (subs join-alias 0 dash-idx)+ :fk-field (subs join-alias (+ dash-idx (count implicit-join-display-name-separator)))})))++(defn- try-parse-filter-to-parts+ "Try to parse a display name using filter patterns.+ Filter patterns have :prefix (text before column) and :separator (text between column and first value/end).+ Returns {:column str, :prefix str, :separator str-or-nil, :remainder str-or-nil} or nil."+ [display-name patterns]+ (perf/some (fn [{:keys [prefix separator]}]+ ;; Skip degenerate patterns where both prefix and separator are empty+ ;; (can happen when a locale translates e.g. "not {0}" to just "{0}")+ (when (and (or (seq prefix) (seq separator))+ (str/starts-with? display-name prefix))+ (let [after-prefix (subs display-name (count prefix))+ ;; For unary filters (empty separator), column extends to end of string+ sep-idx (if (seq separator)+ (str/index-of after-prefix separator)+ (count after-prefix))]+ (when (and sep-idx (pos? sep-idx))+ {:column (subs after-prefix 0 sep-idx)+ :prefix prefix+ :separator separator+ :remainder (when (seq separator)+ (subs after-prefix (+ sep-idx (count separator))))}))))+ patterns))++(defn- try-parse-colon-suffix-to-parts+ "Try to parse a display name with a colon suffix.+ Returns {:matched true, :column str, :suffix str} or nil."+ [display-name]+ (let [colon-idx (str/last-index-of display-name column-display-name-separator)]+ (when (and colon-idx (pos? colon-idx))+ {:matched true+ :column (subs display-name 0 colon-idx)+ :suffix (subs display-name (+ colon-idx (count column-display-name-separator)))})))++(defn- find-earliest-conjunction+ "Find the earliest conjunction in `s` where the left side matches a filter pattern.+ Prefers earliest position; at the same position, prefers the longest conjunction.+ Returns {:left str :conjunction str :right str} or nil."+ [s conjunctions filter-patterns]+ (->> conjunctions+ (keep (fn [conj-str]+ (when-let [idx (str/index-of s conj-str)]+ (let [left (subs s 0 idx)+ right (subs s (+ idx (count conj-str)))]+ (when (try-parse-filter-to-parts left filter-patterns)+ {:left left :conjunction conj-str :right right :idx idx})))))+ (sort-by (juxt :idx #(- (count (:conjunction %)))))+ first))++(defn- try-split-compound+ "Try to split a display name into compound filter clauses.+ Iteratively splits on conjunctions ('and', 'or', ', ') from left to right.+ Only splits where both neighbors match a filter pattern, to avoid splitting+ 'between 100 and 200' on 'and'.+ Returns a vector of alternating clauses and conjunctions, e.g.+ [\"X is empty\" \", \" \"Y is empty\" \", and \" \"Z is empty\"], or nil."+ [display-name conjunctions filter-patterns]+ (when (and (seq conjunctions) (seq filter-patterns))+ (loop [remaining display-name+ result []]+ (if-let [{:keys [left conjunction right]} (find-earliest-conjunction remaining conjunctions filter-patterns)]+ (recur right (conj result left conjunction))+ ;; No more conjunctions found. If we split at least once, the remainder must also be a valid filter.+ (when (and (seq result) (try-parse-filter-to-parts remaining filter-patterns))+ (conj result remaining))))))++(defn parse-column-display-name-parts+ "Parse a column display name into a flat list of parts for translation.++ Takes a display name string and an optional vector of aggregation patterns+ (each pattern is a map with :prefix and :suffix keys).++ Returns a vector of parts, where each part is a map with:+ - :type - either :static (don't translate) or :translatable (should be translated)+ - :value - the string value of this part++ The FE simply needs to:+ 1. Translate all parts where :type is :translatable+ 2. Concatenate all :value strings together++ Examples:+ - \"Total\" => [{:type :translatable, :value \"Total\"}]++ - \"Sum of Total\" =>+ [{:type :static, :value \"Sum of \"}+ {:type :translatable, :value \"Total\"}]++ - \"Sum of Total matching condition\" =>+ [{:type :static, :value \"Sum of \"}+ {:type :translatable, :value \"Total\"}+ {:type :static, :value \" matching condition\"}]++ - \"Products → Total\" =>+ [{:type :translatable, :value \"Products\"}+ {:type :static, :value \" → \"}+ {:type :translatable, :value \"Total\"}]++ - \"People - Product → Created At: Month\" =>+ [{:type :translatable, :value \"People\"}+ {:type :static, :value \" - \"}+ {:type :translatable, :value \"Product\"}+ {:type :static, :value \" → \"}+ {:type :translatable, :value \"Created At\"}+ {:type :static, :value \": \"}+ {:type :static, :value \"Month\"}]"+ ([display-name]+ (parse-column-display-name-parts display-name nil nil nil))+ ([display-name aggregation-patterns]+ (parse-column-display-name-parts display-name aggregation-patterns nil nil))+ ([display-name aggregation-patterns filter-patterns]+ (parse-column-display-name-parts display-name aggregation-patterns filter-patterns nil))+ ([display-name aggregation-patterns filter-patterns conjunctions]+ (letfn [(parse-inner [string]+ ;; Recursively parse the inner part which may have more patterns+ (parse-column-display-name-parts string aggregation-patterns filter-patterns conjunctions))++ (parse-join-alias [join-alias]+ ;; Parse join alias which may be an implicit join like "People - Product"+ (if-let [{:keys [table fk-field]} (try-parse-implicit-join-to-parts join-alias)]+ (-> []+ (into (parse-inner table))+ (conj (static-part implicit-join-display-name-separator))+ (into (parse-inner fk-field)))+ ;; Simple join alias, just translate it+ (parse-inner join-alias)))]++ (or+ ;; First try compound filter (e.g. "X is empty or Y is empty")+ ;; Must be before individual filter matching so each clause is parsed independently.+ (when-let [segments (try-split-compound display-name conjunctions filter-patterns)]+ ;; segments is [clause conj clause conj clause ...] — odd indices are conjunctions+ (into []+ (mapcat #(if (odd? %2)+ [(static-part %1)]+ (parse-inner %1))+ segments (range))))++ ;; Then try aggregation patterns (most specific, wraps other patterns)+ (when-let [{:keys [prefix suffix inner]} (try-parse-aggregation-to-parts display-name aggregation-patterns)]+ (-> []+ (cond-> (seq prefix) (conj (static-part prefix)))+ (into (parse-inner inner))+ (cond-> (seq suffix) (conj (static-part suffix)))))++ ;; Then try filter patterns (column + operator + values)+ ;; Must be before join/colon parsing since filter text may contain ": " or " → "+ (when-let [{:keys [column prefix separator remainder]}+ (try-parse-filter-to-parts display-name filter-patterns)]+ (-> []+ (cond-> (seq prefix) (conj (static-part prefix)))+ (into (parse-inner column))+ (cond-> (seq separator) (conj (static-part separator)))+ (cond-> (seq remainder) (conj (static-part remainder)))))++ ;; Then try join pattern+ (when-let [{:keys [join-alias column]} (try-parse-join-to-parts display-name)]+ (-> []+ (into (parse-join-alias join-alias))+ (conj (static-part join-display-name-separator))+ (into (parse-inner column))))++ ;; Then try colon suffix (temporal bucket or binning)+ ;; The suffix is static because it's a unit name (Month, Day, etc.) or binning label+ (when-let [{:keys [column suffix]} (try-parse-colon-suffix-to-parts display-name)]+ (-> []+ (into (parse-inner column))+ (conj (static-part column-display-name-separator))+ (conj (static-part suffix))))++ ;; Otherwise it's a plain column name - translatable+ [(translatable-part display-name)]))))diff --git a/src/metabase/lib/expression.cljc b/src/metabase/lib/expression.cljcindex c3a9e86fe2e..2e347f70e8f 100644--- a/src/metabase/lib/expression.cljc+++ b/src/metabase/lib/expression.cljc@@ -7,6 +7,7 @@[medley.core :as m][metabase.lib.common :as lib.common][metabase.lib.computed :as lib.computed]+ [metabase.lib.display-name :as lib.display-name][metabase.lib.hierarchy :as lib.hierarchy][metabase.lib.metadata :as lib.metadata][metabase.lib.metadata.calculation :as lib.metadata.calculation]@@ -136,9 +137,9 @@(defmethod lib.metadata.calculation/display-name-method :expression[_query _stage-number [_expression {:keys [temporal-unit] :as _opts} expression-name] _style](letfn [(temporal-format [display-name]- (lib.util/format "%s: %s" display-name (-> (name temporal-unit)- (str/replace \- \space)- u/capitalize-en)))]+ (str display-name+ lib.display-name/column-display-name-separator+ (lib.temporal-bucket/describe-temporal-unit temporal-unit)))](cond-> expression-nametemporal-unit temporal-format)))diff --git a/src/metabase/lib/filter.cljc b/src/metabase/lib/filter.cljcindex fd22005a349..c483ffd05e5 100644--- a/src/metabase/lib/filter.cljc+++ b/src/metabase/lib/filter.cljc@@ -2,6 +2,7 @@(:refer-clojure :exclude [filter and or not = < <= > >= not-empty case every? some mapv empty? not-empty#?(:clj doseq) #?(:clj for)])(:require+ [clojure.string :as str][inflections.core :as inflections][metabase.lib.common :as lib.common][metabase.lib.dispatch :as lib.dispatch]@@ -39,6 +40,40 @@(doseq [tag [:is-null :not-null :is-empty :not-empty :not]](lib.hierarchy/derive tag ::unary))+(def ^:private unary-filter-display-fns+ "Filter display name functions that take 1 argument (column name only)."+ {:is-empty (fn [col] (i18n/tru "{0} is empty" col))+ :is-not-empty (fn [col] (i18n/tru "{0} is not empty" col))+ :not (fn [col] (i18n/tru "not {0}" col))})++(def ^:private binary-filter-display-fns+ "Filter display name functions that take 2 arguments (column + value)."+ {:is-before (fn [a b] (i18n/tru "{0} is before {1}" a b))+ :is-less-than (fn [a b] (i18n/tru "{0} is less than {1}" a b))+ :is-less-than-or-equal-to (fn [a b] (i18n/tru "{0} is less than or equal to {1}" a b))+ :is-after (fn [a b] (i18n/tru "{0} is after {1}" a b))+ :is-greater-than (fn [a b] (i18n/tru "{0} is greater than {1}" a b))+ :is-greater-than-or-equal-to (fn [a b] (i18n/tru "{0} is greater than or equal to {1}" a b))+ :is-equal-to (fn [a b] (i18n/tru "{0} is equal to {1}" a b))+ :is-not-equal-to (fn [a b] (i18n/tru "{0} is not equal to {1}" a b))+ :is-on (fn [a b] (i18n/tru "{0} is on {1}" a b))+ :is-in (fn [a b] (i18n/tru "{0} is in {1}" a b))+ :is (fn [a b] (i18n/tru "{0} is {1}" a b))+ :excludes (fn [a b] (i18n/tru "{0} excludes {1}" a b))+ :excludes-each (fn [a b] (i18n/tru "{0} excludes each {1}" a b))+ :excludes-each-year (fn [a b] (i18n/tru "{0} excludes {1} each year" a b))+ :excludes-hour-of (fn [a b] (i18n/tru "{0} excludes the hour of {1}" a b))+ :starts-with (fn [a b] (i18n/tru "{0} starts with {1}" a b))+ :ends-with (fn [a b] (i18n/tru "{0} ends with {1}" a b))+ :contains (fn [a b] (i18n/tru "{0} contains {1}" a b))+ :does-not-contain (fn [a b] (i18n/tru "{0} does not contain {1}" a b))+ :is-in-the (fn [a b] (i18n/tru "{0} is in the {1}" a b))})++(def ^:private ternary-filter-display-fns+ "Filter display name functions that take 3 arguments (column + 2 values)."+ {:is-between (fn [a b c] (i18n/tru "{0} is between {1} and {2}" a b c))+ :is-in-the-2 (fn [a b c] (i18n/tru "{0} is in the {1}, {2}" a b c))})+(defmethod lib.metadata.calculation/describe-top-level-key-method :filters[query stage-number _key](when-let [filters (perf/not-empty (:filters (lib.util/query-stage query stage-number)))]@@ -51,12 +86,17 @@;;; Display names for filter clauses are only really used in generating descriptions for `:case` aggregations or for;;; generating the suggested name for a query.+(defn- conjunction-word+ "Returns the translated conjunction word for `:and` or `:or`."+ [tag]+ (clojure.core/case tag+ :and (i18n/tru "and")+ :or (i18n/tru "or")))+(defmethod lib.metadata.calculation/display-name-method ::compound[query stage-number [tag _opts & subclauses] style](lib.util/join-strings-with-conjunction- (clojure.core/case tag- :and (i18n/tru "and")- :or (i18n/tru "or"))+ (conjunction-word tag)(for [clause subclauses](lib.metadata.calculation/display-name query stage-number clause style))))@@ -198,22 +238,22 @@temporal? #(lib.util/original-isa? % :type/Temporal)](lib.util.match/match-lite expr[:< _ (x :guard temporal?) (y :guard string?)]- (i18n/tru "{0} is before {1}" (->display-name x) (->temporal-name y))+ ((binary-filter-display-fns :is-before) (->display-name x) (->temporal-name y))[:< _ x y]- (i18n/tru "{0} is less than {1}" (->display-name x) (->display-name y))+ ((binary-filter-display-fns :is-less-than) (->display-name x) (->display-name y))[:<= _ x y]- (i18n/tru "{0} is less than or equal to {1}" (->display-name x) (->display-name y))+ ((binary-filter-display-fns :is-less-than-or-equal-to) (->display-name x) (->display-name y))[:> _ (x :guard temporal?) (y :guard string?)]- (i18n/tru "{0} is after {1}" (->display-name x) (->temporal-name y))+ ((binary-filter-display-fns :is-after) (->display-name x) (->temporal-name y))[:> _ x y]- (i18n/tru "{0} is greater than {1}" (->display-name x) (->display-name y))+ ((binary-filter-display-fns :is-greater-than) (->display-name x) (->display-name y))[:>= _ x y]- (i18n/tru "{0} is greater than or equal to {1}" (->display-name x) (->display-name y))+ ((binary-filter-display-fns :is-greater-than-or-equal-to) (->display-name x) (->display-name y));; do not match inner clauses_ nil)))@@ -226,33 +266,33 @@->display-name)](lib.util.match/match-lite expr[:between _ x (y :guard string?) (z :guard string?)]- (i18n/tru "{0} is {1}"- (->unbucketed-display-name x)- (u.time/format-diff y z))+ ((binary-filter-display-fns :is)+ (->unbucketed-display-name x)+ (u.time/format-diff y z))[:between _[:+ _ x [:interval _ n unit]][:relative-datetime _ n2 unit2][:relative-datetime _ 0 _]]- (i18n/tru "{0} is in the {1}, {2}"- (->display-name x)- (u/lower-case-en (lib.temporal-bucket/describe-temporal-interval n2 unit2))- (lib.temporal-bucket/describe-relative-datetime (- n) unit))+ ((ternary-filter-display-fns :is-in-the-2)+ (->display-name x)+ (u/lower-case-en (lib.temporal-bucket/describe-temporal-interval n2 unit2))+ (lib.temporal-bucket/describe-relative-datetime (- n) unit))[:between _[:+ _ x [:interval _ n unit]][:relative-datetime _ 0 _][:relative-datetime _ n2 unit2]]- (i18n/tru "{0} is in the {1}, {2}"- (->display-name x)- (u/lower-case-en (lib.temporal-bucket/describe-temporal-interval n2 unit2))- (lib.temporal-bucket/describe-relative-datetime (- n) unit))+ ((ternary-filter-display-fns :is-in-the-2)+ (->display-name x)+ (u/lower-case-en (lib.temporal-bucket/describe-temporal-interval n2 unit2))+ (lib.temporal-bucket/describe-relative-datetime (- n) unit))[:between _ x y z]- (i18n/tru "{0} is between {1} and {2}"- (->display-name x)- (->display-name y)- (->display-name z))+ ((ternary-filter-display-fns :is-between)+ (->display-name x)+ (->display-name y)+ (->display-name z));; do not match inner clauses_ nil)))@@ -260,9 +300,9 @@(defmethod lib.metadata.calculation/display-name-method :during[query stage-number [_tag _opts expr value unit] style](let [->display-name #(lib.metadata.calculation/display-name query stage-number % style)]- (i18n/tru "{0} is {1}"- (->display-name expr)- (u.time/format-relative-date-range value 1 unit -1 unit {}))))+ ((binary-filter-display-fns :is)+ (->display-name expr)+ (u.time/format-relative-date-range value 1 unit -1 unit {}))))(defmethod lib.metadata.calculation/display-name-method :inside[query stage-number [_tag opts lat-expr lon-expr lat-max lon-min lat-min lon-max] style]@@ -277,13 +317,13 @@(let [expr (lib.metadata.calculation/display-name query stage-number expr style)];; for whatever reason the descriptions of for `:is-null` and `:not-null` is "is empty" and "is not empty".(clojure.core/case tag- :is-null (i18n/tru "{0} is empty" expr)- :not-null (i18n/tru "{0} is not empty" expr)- :is-empty (i18n/tru "{0} is empty" expr)- :not-empty (i18n/tru "{0} is not empty" expr)+ :is-null ((unary-filter-display-fns :is-empty) expr)+ :not-null ((unary-filter-display-fns :is-not-empty) expr)+ :is-empty ((unary-filter-display-fns :is-empty) expr)+ :not-empty ((unary-filter-display-fns :is-not-empty) expr);; TODO -- This description is sorta wack, we should use [[metabase.legacy-mbql.util/negate-filter-clause]] to;; negate `expr` and then generate a description. That would require porting that stuff to pMBQL tho.- :not (i18n/tru "not {0}" expr))))+ :not ((unary-filter-display-fns :not) expr))))(defmethod lib.metadata.calculation/display-name-method :value[query stage-number [_value {:keys [base-type]} expr] style]@@ -302,12 +342,12 @@(clojure.core/and(clojure.core/= (abs n) 1)(clojure.core/= unit :day)))- (i18n/tru "{0} is {1}"- (lib.metadata.calculation/display-name query stage-number expr style)- (u/lower-case-en (lib.temporal-bucket/describe-temporal-interval n unit opts)))- (i18n/tru "{0} is in the {1}"- (lib.metadata.calculation/display-name query stage-number expr style)- (u/lower-case-en (lib.temporal-bucket/describe-temporal-interval n unit opts)))))+ ((binary-filter-display-fns :is)+ (lib.metadata.calculation/display-name query stage-number expr style)+ (u/lower-case-en (lib.temporal-bucket/describe-temporal-interval n unit opts)))+ ((binary-filter-display-fns :is-in-the)+ (lib.metadata.calculation/display-name query stage-number expr style)+ (u/lower-case-en (lib.temporal-bucket/describe-temporal-interval n unit opts)))))(defmethod lib.metadata.calculation/display-name-method :relative-time-interval[query stage-number [_tag _opts column value bucket offset-value offset-bucket] style]@@ -556,3 +596,69 @@:is-null (i18n/tru "Is empty"):not-null (i18n/tru "Not empty"):inside (i18n/tru "Inside"))))++(def ^:private filter-col-marker+ "Marker character placed at the {0} (column name) position in filter templates."+ "\u0000")++(def ^:private filter-val-marker+ "Marker character placed at value positions ({1}, {2}, etc.) in filter templates."+ "\u0001")++(defn- extract-filter-pattern+ "Extract a filter pattern from a translated template string with markers.+ Returns a map with :prefix (text before column) and :separator (text between column and first value/end)."+ [translated]+ (let [col-idx (str/index-of translated filter-col-marker)+ prefix (subs translated 0 col-idx)+ after-col (subs translated (+ col-idx (count filter-col-marker)))+ val-idx (str/index-of after-col filter-val-marker)]+ {:prefix prefix+ :separator (if val-idx+ (subs after-col 0 val-idx)+ after-col)}))++(defn compound-filter-conjunctions+ "Returns conjunction strings used in compound filter display names,+ derived from [[lib.util/join-strings-with-conjunction]] output.+ Longest strings first so greedy matching works correctly."+ []+ (let [conjunctions (mapv conjunction-word [:and :or])+ ;; Extract actual separators by calling join-strings-with-conjunction+ ;; with marker strings and seeing what appears between them.+ two-item (fn [conj-word]+ ;; "A and B" => " and " is between A and B+ (let [result (lib.util/join-strings-with-conjunction conj-word ["A" "B"])]+ (subs result 1 (dec (count result)))))+ three-item (fn [conj-word]+ ;; "A, B, and C" => ", " between A and B, ", and " between B and C+ (let [result (lib.util/join-strings-with-conjunction conj-word ["A" "B" "C"])+ ;; Find the separators around "B"+ b-idx (str/index-of result "B")]+ [(subs result 1 b-idx)+ (subs result (inc b-idx) (dec (count result)))]))]+ (->> (concat+ (map two-item conjunctions)+ (mapcat three-item conjunctions))+ distinct+ (sort-by #(- (count %)))+ vec)))++(defn filter-display-name-patterns+ "Returns filter display name patterns for content translation.+ Each pattern is a map with :prefix and :separator keys.+ :prefix is the text before the column name (empty for most filters, 'not ' for negation).+ :separator is the text immediately after the column name that identifies the filter operator.+ Patterns are sorted by total length descending for longest-match-first."+ []+ (let [M filter-col-marker+ V filter-val-marker]+ (->> (concat+ (for [[_ f] unary-filter-display-fns]+ (extract-filter-pattern (f M)))+ (for [[_ f] binary-filter-display-fns]+ (extract-filter-pattern (f M V)))+ (for [[_ f] ternary-filter-display-fns]+ (extract-filter-pattern (f M V V))))+ (distinct)+ (sort-by #(- (+ (count (:prefix %)) (count (:separator %))))))))diff --git a/src/metabase/lib/js.cljs b/src/metabase/lib/js.cljsindex f3c5084ae3d..803316f0d30 100644--- a/src/metabase/lib/js.cljs+++ b/src/metabase/lib/js.cljs@@ -63,14 +63,18 @@[malli.transform :as mtx][medley.core :as m]^{:clj-kondo/ignore [:discouraged-namespace]} [metabase.legacy-mbql.normalize :as mbql.normalize]+ [metabase.lib.aggregation :as lib.aggregation]+ [metabase.lib.binning :as lib.binning][metabase.lib.cache :as lib.cache][metabase.lib.convert :as lib.convert][metabase.lib.core :as lib.core]+ [metabase.lib.display-name :as lib.display-name][metabase.lib.drill-thru.common :as lib.drill-thru.common][metabase.lib.equality :as lib.equality][metabase.lib.expression :as lib.expression][metabase.lib.fe-util :as lib.fe-util][metabase.lib.field :as lib.field]+ [metabase.lib.filter :as lib.filter][metabase.lib.join :as lib.join][metabase.lib.js.metadata :as js.metadata][metabase.lib.metadata :as lib.metadata]@@ -542,6 +546,51 @@(-> (lib.core/available-binning-strategies a-query stage-number x)to-array)))+(def ^:private aggregation-display-name-patterns-for-locale+ "Cached aggregation patterns, keyed by locale."+ (memoize/lru (fn [_locale] (lib.aggregation/aggregation-display-name-patterns)) :lru/threshold 2))++(def ^:private filter-display-name-patterns-for-locale+ "Cached filter patterns, keyed by locale."+ (memoize/lru (fn [_locale] (lib.filter/filter-display-name-patterns)) :lru/threshold 2))++(def ^:private compound-filter-conjunctions-for-locale+ "Cached compound filter conjunctions, keyed by locale."+ (memoize/lru (fn [_locale] (lib.filter/compound-filter-conjunctions)) :lru/threshold 2))++(defn ^:export parse-column-display-name-parts+ "Parse a column display name into a flat list of parts for translation.++ Returns an array of objects, each with:+ - type: 'static' (don't translate) or 'translatable' (should be translated)+ - value: the string value++ The FE simply needs to:+ 1. Translate all parts where type is 'translatable'+ 2. Concatenate all value strings together++ Patterns are cached per locale."+ [display-name locale]+ (let [parts (lib.display-name/parse-column-display-name-parts+ display-name+ (aggregation-display-name-patterns-for-locale locale)+ (filter-display-name-patterns-for-locale locale)+ (compound-filter-conjunctions-for-locale locale))]+ (clj->js parts)))++(defn ^:export numeric-binning-strategies+ "Returns the list of binning options for numeric fields. These split the data evenly into a fixed number of bins.+ Returns opaque values that can be passed to [[display-info]] for rendering."+ []+ (clj->js (lib.binning/numeric-binning-strategies)))++(defn ^:export coordinate-binning-strategies+ "Returns the list of binning options for coordinate fields (latitude/longitude).+ These split the data into ranges of a certain number of degrees.+ Returns opaque values that can be passed to [[display-info]] for rendering."+ []+ (clj->js (lib.binning/coordinate-binning-strategies)))+;; ## Temporal Bucketing;; The other way to "round" a column's value is by units of time. This is a very common use case: looking at monthly@@ -590,7 +639,7 @@(defn ^:export available-temporal-units"The temporal bucketing units for date type expressions."[]- (to-array (map clj->js (lib.core/available-temporal-units))))+ (clj->js (lib.core/available-temporal-units)));; # Manipulating Clauses;;@@ -1076,7 +1125,7 @@(let [{:keys [operator column values options]} filter-parts]#js {:operator (name operator):column column- :values (to-array (map clj->js values))+ :values (clj->js values):options (cljs-map->js-obj options)})))(defn ^:export number-filter-clause@@ -1095,7 +1144,7 @@(let [{:keys [operator column values]} filter-parts]#js {:operator (name operator):column column- :values (to-array (map clj->js values))})))+ :values (clj->js values)})))(defn ^:export coordinate-filter-clause"Creates a coordinate filter clause based on FE-friendly filter parts. It should be possible to destructure each@@ -1116,7 +1165,7 @@#js {:operator (name operator):column column:longitudeColumn longitude-column- :values (to-array (map clj->js values))})))+ :values (clj->js values)})))(defn ^:export boolean-filter-clause"Creates a boolean filter clause based on FE-friendly filter parts. It should be possible to destructure each created@@ -1134,7 +1183,7 @@(let [{:keys [operator column values]} filter-parts]#js {:operator (name operator):column column- :values (to-array (map clj->js values))})))+ :values (clj->js values)})))(defn ^:export specific-date-filter-clause"Creates a specific date filter clause based on FE-friendly filter parts. It should be possible to destructure each@@ -1198,7 +1247,7 @@#js {:operator (name operator):column column:unit (some-> unit name)- :values (to-array (map clj->js values))})))+ :values (clj->js values)})))(defn ^:export time-filter-clause"Creates a time filter clause based on FE-friendly filter parts. It should be possible to destructure each created@@ -1216,7 +1265,7 @@(let [{:keys [operator column values]} filter-parts]#js {:operator (name operator):column column- :values (to-array (map clj->js values))})))+ :values (clj->js values)})))(defn ^:export default-filter-clause"Creates a default filter clause based on FE-friendly filter parts. It should be possible to destructure each created@@ -2581,7 +2630,7 @@> **Code health:** Healthy"[a-query card-id card-type]- (to-array (map clj->js (lib.core/dependent-metadata a-query card-id (keyword card-type)))))+ (clj->js (lib.core/dependent-metadata a-query card-id (keyword card-type))))(defn ^:export table-or-card-dependent-metadata"Return a JS array of entities which are needed upfront to create a new query based on a table/card.@@ -2590,7 +2639,7 @@> **Code health:** Healthy"[metadata-providerable table-id]- (to-array (map clj->js (lib.core/table-or-card-dependent-metadata metadata-providerable table-id))))+ (clj->js (lib.core/table-or-card-dependent-metadata metadata-providerable table-id)))(defn ^:export can-run"Returns true if the query is runnable.diff --git a/src/metabase/lib/temporal_bucket.cljc b/src/metabase/lib/temporal_bucket.cljcindex c15f645b5c9..925733a1047 100644--- a/src/metabase/lib/temporal_bucket.cljc+++ b/src/metabase/lib/temporal_bucket.cljc@@ -6,12 +6,12 @@[clojure.string :as str][medley.core :as m][metabase.lib.dispatch :as lib.dispatch]+ [metabase.lib.display-name :as lib.display-name][metabase.lib.hierarchy :as lib.hierarchy][metabase.lib.metadata.calculation :as lib.metadata.calculation][metabase.lib.schema :as lib.schema][metabase.lib.schema.common :as lib.schema.common][metabase.lib.schema.temporal-bucketing :as lib.schema.temporal-bucketing]- [metabase.lib.util :as lib.util][metabase.util :as u][metabase.util.i18n :as i18n][metabase.util.malli :as mu]@@ -487,7 +487,7 @@(defn- ends-with-temporal-unit?[s temporal-unit]- (str/ends-with? s (str ": " (describe-temporal-unit temporal-unit))))+ (str/ends-with? s (str lib.display-name/column-display-name-separator (describe-temporal-unit temporal-unit))))(defn ensure-ends-with-temporal-unit"Append `temporal-unit` into a string `s` if appropriate.@@ -499,7 +499,7 @@(= :default temporal-unit)(ends-with-temporal-unit? s temporal-unit))s- (lib.util/format "%s: %s" s (describe-temporal-unit temporal-unit))))+ (str s lib.display-name/column-display-name-separator (describe-temporal-unit temporal-unit))));;; TODO (Cam 6/13/25) -- only used outside of Lib; Lib doesn't use `snake_cased` keys. We should reconsider if this;;; belongs in Lib in its current shape.diff --git a/src/metabase/util/i18n.cljs b/src/metabase/util/i18n.cljsindex a9f4db29061..02a03a2e902 100644--- a/src/metabase/util/i18n.cljs+++ b/src/metabase/util/i18n.cljs@@ -2,7 +2,8 @@"ClojureScript implementation of i18n `tru` macros and the like."(:require["ttag" :as ttag]- [clojure.string :as str])+ [clojure.string :as str]+ [goog.object :as gobject])(:require-macros[metabase.util.i18n]))@@ -14,6 +15,15 @@[format-string](str/replace format-string #"''" "'"))+(defn- make-template-strings-array+ "Creates a JavaScript array that mimics a TemplateStringsArray.+ Tagged template literals in JS pass arrays with a 'raw' property,+ which ttag uses for message ID lookup."+ [strings]+ (let [arr (clj->js strings)]+ (gobject/set arr "raw" arr)+ arr))+(defn js-i18n"Format an i18n `format-string` with `args` with a translated string in the user locale.@@ -25,8 +35,9 @@[format-string & args](let [strings (-> format-stringescape-format-string- (str/split #"\{\d+\}"))]- (apply ttag/t (clj->js strings) (clj->js args))))+ (str/split #"\{\d+\}"))+ template-strings (make-template-strings-array strings)]+ (apply ttag/t template-strings (clj->js args))))(def ^:private re-param-zero #"\{0\}")diff --git a/test/metabase/lib/aggregation_test.cljc b/test/metabase/lib/aggregation_test.cljcindex f9b3385a75f..103306aabc5 100644--- a/test/metabase/lib/aggregation_test.cljc+++ b/test/metabase/lib/aggregation_test.cljc@@ -952,4 +952,38 @@:name "max"}](lib/aggregations-metadata query 1)))))))-;; trivial change to test CI; remove this next time you see it+(deftest ^:parallel aggregation-display-name-patterns-test+ (testing "aggregation-display-name-patterns returns patterns with prefix and suffix"+ (let [patterns (lib.aggregation/aggregation-display-name-patterns)]+ (testing "returns a non-empty vector"+ (is (vector? patterns))+ (is (pos? (count patterns))))+ (testing "each pattern has :prefix and :suffix keys"+ (doseq [pattern patterns]+ (is (contains? pattern :prefix))+ (is (contains? pattern :suffix))+ (is (string? (:prefix pattern)))+ (is (string? (:suffix pattern)))))+ (testing "includes expected aggregation patterns"+ (let [prefixes (set (map :prefix patterns))]+ (is (contains? prefixes "Sum of "))+ (is (contains? prefixes "Average of "))+ (is (contains? prefixes "Distinct values of "))+ (is (contains? prefixes "Max of "))+ (is (contains? prefixes "Min of "))+ (is (contains? prefixes "Count of "))))+ (testing "includes pattern with suffix (sum-where)"+ (is (some #(= " matching condition" (:suffix %)) patterns))))))++(deftest ^:parallel aggregation-display-name-patterns-order-test+ (testing "more specific patterns (with suffix) come before general patterns"+ (let [patterns (lib.aggregation/aggregation-display-name-patterns)+ sum-where-idx (some #(when (= " matching condition" (:suffix (second %))) (first %))+ (map-indexed vector patterns))+ sum-idx (some #(when (and (= "Sum of " (:prefix (second %)))+ (= "" (:suffix (second %))))+ (first %))+ (map-indexed vector patterns))]+ (when (and sum-where-idx sum-idx)+ (is (< sum-where-idx sum-idx)+ "Sum-where pattern should come before plain Sum pattern")))))diff --git a/test/metabase/lib/display_name_test.cljc b/test/metabase/lib/display_name_test.cljcnew file mode 100644index 00000000000..08be2f65acc--- /dev/null+++ b/test/metabase/lib/display_name_test.cljc@@ -0,0 +1,226 @@+(ns metabase.lib.display-name-test+ (:require+ [clojure.test :refer [deftest is testing]]+ [metabase.lib.aggregation :as lib.aggregation]+ [metabase.lib.display-name :as lib.display-name]+ [metabase.lib.filter :as lib.filter]))++(deftest ^:parallel parse-column-display-name-parts-plain-column-test+ (testing "Plain column names should be translatable"+ (is (= [{:type :translatable, :value "Total"}]+ (lib.display-name/parse-column-display-name-parts "Total")))+ (is (= [{:type :translatable, :value "Created At"}]+ (lib.display-name/parse-column-display-name-parts "Created At")))))++(deftest ^:parallel parse-column-display-name-parts-temporal-bucket-test+ (testing "Temporal bucket patterns should have static suffix"+ (is (= [{:type :translatable, :value "Total"}+ {:type :static, :value ": "}+ {:type :static, :value "Month"}]+ (lib.display-name/parse-column-display-name-parts "Total: Month")))+ (is (= [{:type :translatable, :value "Created At"}+ {:type :static, :value ": "}+ {:type :static, :value "Day of week"}]+ (lib.display-name/parse-column-display-name-parts "Created At: Day of week")))))++(deftest ^:parallel parse-column-display-name-parts-join-test+ (testing "Joined table patterns should have translatable parts separated by static arrow"+ (is (= [{:type :translatable, :value "Products"}+ {:type :static, :value " → "}+ {:type :translatable, :value "Total"}]+ (lib.display-name/parse-column-display-name-parts "Products → Total")))+ (is (= [{:type :translatable, :value "Orders"}+ {:type :static, :value " → "}+ {:type :translatable, :value "Products"}+ {:type :static, :value " → "}+ {:type :translatable, :value "Total"}]+ (lib.display-name/parse-column-display-name-parts "Orders → Products → Total")))))++(deftest ^:parallel parse-column-display-name-parts-implicit-join-test+ (testing "Implicit join patterns (with dash) should be parsed when arrow is present"+ (is (= [{:type :translatable, :value "People"}+ {:type :static, :value " - "}+ {:type :translatable, :value "Product"}+ {:type :static, :value " → "}+ {:type :translatable, :value "Created At"}]+ (lib.display-name/parse-column-display-name-parts "People - Product → Created At")))))++(deftest ^:parallel parse-column-display-name-parts-join-with-temporal-bucket-test+ (testing "Joined table with temporal bucket"+ (is (= [{:type :translatable, :value "Products"}+ {:type :static, :value " → "}+ {:type :translatable, :value "Created At"}+ {:type :static, :value ": "}+ {:type :static, :value "Month"}]+ (lib.display-name/parse-column-display-name-parts "Products → Created At: Month")))))++(deftest ^:parallel parse-column-display-name-parts-aggregation-test+ (testing "Aggregation patterns should have static prefix/suffix"+ (let [patterns (lib.aggregation/aggregation-display-name-patterns)]+ (is (= [{:type :static, :value "Sum of "}+ {:type :translatable, :value "Total"}]+ (lib.display-name/parse-column-display-name-parts "Sum of Total" patterns)))+ (is (= [{:type :static, :value "Distinct values of "}+ {:type :translatable, :value "Category"}]+ (lib.display-name/parse-column-display-name-parts "Distinct values of Category" patterns)))+ (is (= [{:type :static, :value "Sum of "}+ {:type :translatable, :value "Price"}+ {:type :static, :value " matching condition"}]+ (lib.display-name/parse-column-display-name-parts "Sum of Price matching condition" patterns))))))++(deftest ^:parallel parse-column-display-name-parts-aggregation-with-join-test+ (testing "Aggregation with joined table"+ (let [patterns (lib.aggregation/aggregation-display-name-patterns)]+ (is (= [{:type :static, :value "Distinct values of "}+ {:type :translatable, :value "Products"}+ {:type :static, :value " → "}+ {:type :translatable, :value "Created At"}]+ (lib.display-name/parse-column-display-name-parts "Distinct values of Products → Created At" patterns))))))++(deftest ^:parallel parse-column-display-name-parts-complex-test+ (testing "Complex pattern: aggregation with implicit join and temporal bucket"+ (let [patterns (lib.aggregation/aggregation-display-name-patterns)]+ (is (= [{:type :static, :value "Distinct values of "}+ {:type :translatable, :value "People"}+ {:type :static, :value " - "}+ {:type :translatable, :value "Product"}+ {:type :static, :value " → "}+ {:type :translatable, :value "Created At"}+ {:type :static, :value ": "}+ {:type :static, :value "Month"}]+ (lib.display-name/parse-column-display-name-parts+ "Distinct values of People - Product → Created At: Month"+ patterns))))))++(deftest ^:parallel parse-column-display-name-parts-rtl-test+ (testing "RTL pattern: value comes first (e.g., Hebrew 'Sum of X' = 'X של סכום')"+ (let [patterns [{:prefix "", :suffix " של סכום"}]]+ (is (= [{:type :translatable, :value "Total"}+ {:type :static, :value " של סכום"}]+ (lib.display-name/parse-column-display-name-parts "Total של סכום" patterns)))))++ (testing "Wrapped pattern: value in middle (e.g., French 'Somme de X totale')"+ (let [patterns [{:prefix "Somme de ", :suffix " totale"}]]+ (is (= [{:type :static, :value "Somme de "}+ {:type :translatable, :value "Total"}+ {:type :static, :value " totale"}]+ (lib.display-name/parse-column-display-name-parts "Somme de Total totale" patterns)))))++ (testing "Nested RTL patterns"+ (let [patterns [{:prefix "", :suffix " של סכום"}+ {:prefix "", :suffix " של מינימום"}]]+ (is (= [{:type :translatable, :value "Total"}+ {:type :static, :value " של מינימום"}+ {:type :static, :value " של סכום"}]+ (lib.display-name/parse-column-display-name-parts "Total של מינימום של סכום" patterns)))))++ (testing "RTL pattern with join"+ (let [patterns [{:prefix "", :suffix " של סכום"}]]+ (is (= [{:type :translatable, :value "Products"}+ {:type :static, :value " → "}+ {:type :translatable, :value "Total"}+ {:type :static, :value " של סכום"}]+ (lib.display-name/parse-column-display-name-parts "Products → Total של סכום" patterns))))))++(deftest ^:parallel parse-column-display-name-parts-filter-test+ (let [filter-patterns (lib.filter/filter-display-name-patterns)+ conjunctions (lib.filter/compound-filter-conjunctions)]+ (testing "Between filter should not split 'and' in values as compound conjunction"+ (is (= [{:type :translatable, :value "Total"}+ {:type :static, :value " is between "}+ {:type :static, :value "100 and 200"}]+ (lib.display-name/parse-column-display-name-parts "Total is between 100 and 200" nil filter-patterns conjunctions))))++ (testing "Greater than filter"+ (is (= [{:type :translatable, :value "Total"}+ {:type :static, :value " is greater than "}+ {:type :static, :value "100"}]+ (lib.display-name/parse-column-display-name-parts "Total is greater than 100" nil filter-patterns conjunctions))))++ (testing "Unary filter (not)"+ (is (= [{:type :static, :value "not "}+ {:type :translatable, :value "Total"}]+ (lib.display-name/parse-column-display-name-parts "not Total" nil filter-patterns conjunctions))))++ (testing "Unary filter (is empty)"+ (is (= [{:type :translatable, :value "Total"}+ {:type :static, :value " is empty"}]+ (lib.display-name/parse-column-display-name-parts "Total is empty" nil filter-patterns conjunctions))))++ (testing "Filter with join"+ (is (= [{:type :translatable, :value "Products"}+ {:type :static, :value " → "}+ {:type :translatable, :value "Total"}+ {:type :static, :value " is between "}+ {:type :static, :value "100 and 200"}]+ (lib.display-name/parse-column-display-name-parts "Products → Total is between 100 and 200" nil filter-patterns conjunctions))))++ (testing "Filter with temporal bucket"+ (is (= [{:type :translatable, :value "Created At"}+ {:type :static, :value ": "}+ {:type :static, :value "Month"}+ {:type :static, :value " is before "}+ {:type :static, :value "2024"}]+ (lib.display-name/parse-column-display-name-parts "Created At: Month is before 2024" nil filter-patterns conjunctions))))++ (testing "Contains filter"+ (is (= [{:type :translatable, :value "Category"}+ {:type :static, :value " contains "}+ {:type :static, :value "Widget"}]+ (lib.display-name/parse-column-display-name-parts "Category contains Widget" nil filter-patterns conjunctions))))++ (testing "Does not contain filter"+ (is (= [{:type :translatable, :value "Category"}+ {:type :static, :value " does not contain "}+ {:type :static, :value "Widget"}]+ (lib.display-name/parse-column-display-name-parts "Category does not contain Widget" nil filter-patterns conjunctions))))))++(deftest ^:parallel parse-column-display-name-parts-compound-filter-test+ (let [filter-patterns (lib.filter/filter-display-name-patterns)+ conjunctions (lib.filter/compound-filter-conjunctions)]+ (testing "Two-item compound filter with 'or'"+ (is (= [{:type :translatable, :value "Review Requested At"}+ {:type :static, :value " is not empty"}+ {:type :static, :value " or "}+ {:type :translatable, :value "Reviewed At"}+ {:type :static, :value " is not empty"}]+ (lib.display-name/parse-column-display-name-parts+ "Review Requested At is not empty or Reviewed At is not empty"+ nil filter-patterns conjunctions))))++ (testing "Two-item compound filter with 'and'"+ (is (= [{:type :translatable, :value "Total"}+ {:type :static, :value " is greater than "}+ {:type :static, :value "100"}+ {:type :static, :value " and "}+ {:type :translatable, :value "Price"}+ {:type :static, :value " is less than "}+ {:type :static, :value "50"}]+ (lib.display-name/parse-column-display-name-parts+ "Total is greater than 100 and Price is less than 50"+ nil filter-patterns conjunctions))))++ (testing "Three-item compound filter"+ (is (= [{:type :translatable, :value "Total"}+ {:type :static, :value " is empty"}+ {:type :static, :value ", "}+ {:type :translatable, :value "Price"}+ {:type :static, :value " is empty"}+ {:type :static, :value ", and "}+ {:type :translatable, :value "Status"}+ {:type :static, :value " is empty"}]+ (lib.display-name/parse-column-display-name-parts+ "Total is empty, Price is empty, and Status is empty"+ nil filter-patterns conjunctions))))))++(deftest ^:parallel parse-column-display-name-parts-filter-with-aggregation-test+ (let [agg-patterns (lib.aggregation/aggregation-display-name-patterns)+ filter-patterns (lib.filter/filter-display-name-patterns)]+ (testing "Filter patterns should not interfere with aggregation patterns"+ (is (= [{:type :static, :value "Sum of "}+ {:type :translatable, :value "Total"}]+ (lib.display-name/parse-column-display-name-parts "Sum of Total" agg-patterns filter-patterns))))++ (testing "Plain column name is unchanged when filter patterns are present"+ (is (= [{:type :translatable, :value "Total"}]+ (lib.display-name/parse-column-display-name-parts "Total" agg-patterns filter-patterns))))))