From e481e5197d888620695c8ed49959897d8d40757d Mon Sep 17 00:00:00 2001
From: Alexander Lesnenko <alxnddr@users.noreply.github.com>
Date: Thu, 8 Jul 2021 23:47:13 +0300
Subject: [PATCH] Saved question picker bug bash (#16940)
* fix Saved questions string translation
* fix Everything else folder is not showing items in the saved question picker for other languages
* translate query builder header
* Fix saved questions db on the client side
* i18n on "Saved Questions"
Co-authored-by: dan sutton <dan@dpsutton.com>
---
.../src/metabase/query_builder/components/DataSelector.jsx | 2 +-
.../components/saved-question-picker/SavedQuestionPicker.jsx | 4 ++--
.../query_builder/components/view/NewQuestionHeader.jsx | 3 ++-
src/metabase/api/database.clj | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/frontend/src/metabase/query_builder/components/DataSelector.jsx b/frontend/src/metabase/query_builder/components/DataSelector.jsx
index 0a8ac286bcd..aad7f9ebdae 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector.jsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector.jsx
@@ -899,7 +899,7 @@ const DatabaseSchemaPicker = ({
}
const sections = databases.map(database => ({
- name: database.name,
+ name: database.is_saved_questions ? t`Saved Questions` : database.name,
items:
!database.is_saved_questions && database.schemas.length > 1
? database.schemas.map(schema => ({
diff --git a/frontend/src/metabase/query_builder/components/saved-question-picker/SavedQuestionPicker.jsx b/frontend/src/metabase/query_builder/components/saved-question-picker/SavedQuestionPicker.jsx
index 91bc2ddc6f8..b3a20bab5a6 100644
--- a/frontend/src/metabase/query_builder/components/saved-question-picker/SavedQuestionPicker.jsx
+++ b/frontend/src/metabase/query_builder/components/saved-question-picker/SavedQuestionPicker.jsx
@@ -37,7 +37,7 @@ const propTypes = {
const OUR_ANALYTICS_COLLECTION = {
...ROOT_COLLECTION,
- schemaName: "Everything else",
+ schemaName: t`Everything else`,
icon: "folder",
};
@@ -110,7 +110,7 @@ function SavedQuestionPicker({
<CollectionsContainer>
<BackButton onClick={onBack}>
<Icon name="chevronleft" className="mr1" />
- {t`Saved questions`}
+ {t`Saved Questions`}
</BackButton>
<Box my={1}>
<Tree
diff --git a/frontend/src/metabase/query_builder/components/view/NewQuestionHeader.jsx b/frontend/src/metabase/query_builder/components/view/NewQuestionHeader.jsx
index 3509a2a65fe..52f4554aaf5 100644
--- a/frontend/src/metabase/query_builder/components/view/NewQuestionHeader.jsx
+++ b/frontend/src/metabase/query_builder/components/view/NewQuestionHeader.jsx
@@ -1,11 +1,12 @@
import React from "react";
+import { t } from "ttag";
import ViewSection, { ViewHeading } from "./ViewSection";
export default function NewQuestionHeader(props) {
return (
<ViewSection {...props}>
- <ViewHeading>{`Pick your starting data`}</ViewHeading>
+ <ViewHeading>{t`Pick your starting data`}</ViewHeading>
</ViewSection>
);
}
diff --git a/src/metabase/api/database.clj b/src/metabase/api/database.clj
index f3f4df47af7..e279a285edc 100644
--- a/src/metabase/api/database.clj
+++ b/src/metabase/api/database.clj
@@ -153,7 +153,7 @@
(defn- saved-cards-virtual-db-metadata [& {:keys [include-tables? include-fields?]}]
(when (public-settings/enable-nested-queries)
- (cond-> {:name "Saved Questions"
+ (cond-> {:name (trs "Saved Questions")
:id mbql.s/saved-questions-virtual-database-id
:features #{:basic-aggregations}
:is_saved_questions true}
--
GitLab