From 93657909345226b056fc65e1f5c630afc011b15a Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Wed, 18 Jan 2023 14:20:51 +0300
Subject: [PATCH 01/16] localization

---
 superset/initialization/__init__.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/superset/initialization/__init__.py b/superset/initialization/__init__.py
index 7e37781502313..f4df90796dcf3 100644
--- a/superset/initialization/__init__.py
+++ b/superset/initialization/__init__.py
@@ -330,7 +330,7 @@ def init_views(self) -> None:
         )
         appbuilder.add_link(
             "SQL Editor",
-            label=_("SQL Lab"),
+            label=__("SQL Lab"),
             href="/superset/sqllab/",
             category_icon="fa-flask",
             icon="fa-flask",
@@ -338,7 +338,8 @@ def init_views(self) -> None:
             category_label=__("SQL"),
         )
         appbuilder.add_link(
-            __("Saved Queries"),
+            "Saved Queries",
+            label=__("Saved Queries"),
             href="/savedqueryview/list/",
             icon="fa-save",
             category="SQL Lab",
@@ -346,7 +347,7 @@ def init_views(self) -> None:
         )
         appbuilder.add_link(
             "Query Search",
-            label=_("Query History"),
+            label=__("Query History"),
             href="/superset/sqllab/history/",
             icon="fa-search",
             category_icon="fa-flask",
@@ -385,7 +386,7 @@ def init_views(self) -> None:
         appbuilder.add_view(
             AnnotationLayerView,
             "Annotation Layers",
-            label=_("Annotation Layers"),
+            label=__("Annotation Layers"),
             href="/annotationlayer/list/",
             icon="fa-comment",
             category_icon="",
@@ -406,6 +407,7 @@ def init_views(self) -> None:
         appbuilder.add_view(
             RowLevelSecurityView,
             "Row Level Security",
+            label=__("Row Level Security"),
             href="/rowlevelsecurity/list/",
             label=__("Row Level Security"),
             category="Security",

From 6a7c86734b9635a4a7ffd61bd2dc70e4b993ef50 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Wed, 18 Jan 2023 14:22:08 +0300
Subject: [PATCH 02/16] localization

---
 .../ColumnConfigControl/constants.tsx         |  2 +-
 .../src/time-format/formatters/smartDate.ts   |  3 +-
 .../formatters/smartDateDetailed.ts           |  3 +-
 .../formatters/smartDateVerbose.ts            |  3 +-
 .../src/Calendar.js                           |  5 +-
 .../src/Histogram.jsx                         |  2 +-
 .../src/Sunburst.js                           |  7 +-
 .../src/Radar/controlPanel.tsx                |  2 +-
 .../src/PivotTableChart.tsx                   |  3 +-
 .../src/react-pivottable/TableRenderers.jsx   | 15 ++--
 .../DataTable/components/SelectPageSize.tsx   |  5 +-
 .../src/SqlLab/actions/sqlLab.js              |  5 +-
 .../components/QueryStateLabel/index.tsx      |  5 +-
 .../src/SqlLab/components/ResultSet/index.tsx |  4 +-
 .../src/SqlLab/components/SouthPane/index.tsx |  5 +-
 .../src/components/DatabaseSelector/index.tsx |  3 +-
 .../Datasource/ChangeDatasourceModal.tsx      |  2 +-
 .../components/Datasource/DatasourceModal.tsx |  2 +
 .../components/ListView/Filters/DateRange.tsx |  3 +-
 .../src/components/Select/Select.tsx          |  2 +-
 .../src/dashboard/actions/dashboardState.js   |  5 +-
 .../src/dashboard/components/SaveModal.tsx    |  2 +-
 .../menu/BackgroundStyleDropdown.tsx          |  6 +-
 .../FiltersConfigForm/DatasetSelect.tsx       |  1 +
 .../FiltersConfigForm/FiltersConfigForm.tsx   |  4 +-
 .../stylesheets/components/column.less        |  1 +
 .../dashboard/stylesheets/components/row.less |  1 +
 .../src/dashboard/util/newComponentFactory.js |  2 +-
 superset-frontend/src/explore/constants.ts    | 40 +++++----
 .../getChartRequiredFieldsMissingMessage.ts   |  6 +-
 .../src/views/CRUD/alert/AlertList.tsx        |  2 +-
 .../src/views/CRUD/alert/AlertReportModal.tsx |  2 +
 .../src/views/CRUD/alert/ExecutionLog.tsx     |  9 +-
 .../views/CRUD/annotation/AnnotationModal.tsx |  1 +
 .../annotationlayers/AnnotationLayersList.tsx |  2 +-
 .../CRUD/csstemplates/CssTemplatesList.tsx    |  2 +-
 .../DatabaseConnectionForm/EncryptedField.tsx |  4 +-
 .../ValidatedInputField.tsx                   |  6 +-
 .../database/DatabaseModal/SSHTunnelForm.tsx  |  4 +-
 .../data/database/DatabaseModal/index.tsx     |  4 +-
 .../src/views/CRUD/data/query/QueryList.tsx   |  2 +-
 .../CRUD/data/savedquery/SavedQueryList.tsx   |  2 +-
 superset-frontend/src/views/CRUD/hooks.ts     |  6 +-
 .../src/views/CRUD/welcome/EmptyState.tsx     | 13 +--
 .../annotation_layers/annotations/schemas.py  |  3 +-
 superset/charts/post_processing.py            |  7 +-
 superset/commands/importers/v1/__init__.py    | 14 ++--
 superset/connectors/base/models.py            |  5 +-
 superset/dashboards/schemas.py                |  5 +-
 superset/databases/schemas.py                 |  2 +-
 superset/errors.py                            | 84 ++++++++++---------
 superset/models/sql_lab.py                    |  5 +-
 superset/reports/dao.py                       |  3 +-
 superset/sql_lab.py                           | 12 ++-
 superset/sqllab/exceptions.py                 |  9 +-
 superset/sqllab/query_render.py               |  4 +-
 superset/utils/date_parser.py                 |  2 +-
 superset/utils/encrypt.py                     |  9 +-
 superset/utils/schema.py                      |  3 +-
 superset/views/api.py                         |  3 +-
 superset/views/dashboard/mixin.py             |  2 +-
 superset/views/database/mixins.py             |  2 +-
 superset/views/database/views.py              | 22 ++---
 superset/views/sql_lab/views.py               |  2 +-
 superset/viz.py                               |  2 +-
 65 files changed, 254 insertions(+), 154 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx
index a749e5a7cc0d7..fffadb449ac40 100644
--- a/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx
+++ b/superset-frontend/packages/superset-ui-chart-controls/src/shared-controls/components/ColumnConfigControl/constants.tsx
@@ -93,7 +93,7 @@ const columnWidth: ControlFormItemSpec<'InputNumber'> = {
     "Default minimal column width in pixels, actual width may still be larger than this if other columns don't need much space",
   ),
   width: 120,
-  placeholder: 'auto',
+  placeholder: t('auto'),
   debounceDelay: 400,
   validators: [validateNumber],
 };
diff --git a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDate.ts b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDate.ts
index 0aafb2a893cc2..92fb99c9c24f7 100644
--- a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDate.ts
+++ b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDate.ts
@@ -17,11 +17,12 @@
  * under the License.
  */
 
+import { t } from '@superset-ui/core';
 import createMultiFormatter from '../factories/createMultiFormatter';
 
 const smartDateFormatter = createMultiFormatter({
   id: 'smart_date',
-  label: 'Adaptative Formatting',
+  label: t('Adaptative Formatting'),
   formats: {
     millisecond: '.%Lms',
     second: ':%Ss',
diff --git a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateDetailed.ts b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateDetailed.ts
index d8a30e9a1c039..1d2ddd8f92b05 100644
--- a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateDetailed.ts
+++ b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateDetailed.ts
@@ -17,11 +17,12 @@
  * under the License.
  */
 
+import { t } from '@superset-ui/core';
 import createMultiFormatter from '../factories/createMultiFormatter';
 
 const smartDateDetailedFormatter = createMultiFormatter({
   id: 'smart_date_detailed',
-  label: 'Detailed adaptive formatter',
+  label: t('Detailed adaptive formatter'),
   formats: {
     millisecond: '%Y-%m-%d %H:%M:%S.%L',
     second: '%Y-%m-%d %H:%M:%S',
diff --git a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateVerbose.ts b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateVerbose.ts
index 4178322864bce..c309060617ca0 100644
--- a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateVerbose.ts
+++ b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateVerbose.ts
@@ -17,11 +17,12 @@
  * under the License.
  */
 
+import { t } from '@superset-ui/core';
 import createMultiFormatter from '../factories/createMultiFormatter';
 
 const smartDateFormatter = createMultiFormatter({
   id: 'smart_date_verbose',
-  label: 'Verbose Adaptative Formatting',
+  label: t('Verbose Adaptative Formatting'),
   formats: {
     millisecond: '.%L',
     second: '%a %b %d, %I:%M:%S %p',
diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js
index 0417ea3e8b5af..f120f3fa98b0b 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js
@@ -19,7 +19,7 @@
 import PropTypes from 'prop-types';
 import { extent as d3Extent, range as d3Range } from 'd3-array';
 import { select as d3Select } from 'd3-selection';
-import { getSequentialSchemeRegistry } from '@superset-ui/core';
+import { getSequentialSchemeRegistry, t } from '@superset-ui/core';
 import CalHeatMap from './vendor/cal-heatmap';
 
 const propTypes = {
@@ -88,7 +88,8 @@ function Calendar(element, props) {
   Object.keys(metricsData).forEach(metric => {
     const calContainer = div.append('div');
     if (showMetricName) {
-      calContainer.text(`Metric: ${verboseMap[metric] || metric}`);
+      // eslint-disable-next-line prefer-template
+      calContainer.text(t('Metric') + `: ${verboseMap[metric] || metric}`);
     }
     const timestamps = metricsData[metric];
     const extents = d3Extent(Object.keys(timestamps), key => timestamps[key]);
diff --git a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/Histogram.jsx b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/Histogram.jsx
index 2c07267748614..67d5f30f9022d 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-histogram/src/Histogram.jsx
+++ b/superset-frontend/plugins/legacy-plugin-chart-histogram/src/Histogram.jsx
@@ -111,7 +111,7 @@ class CustomHistogram extends React.PureComponent {
             renderTooltip={({ datum, color }) => (
               <div>
                 <strong style={{ color }}>
-                  {datum.bin0} to {datum.bin1}
+                  {datum.bin0} {t('to')} {datum.bin1}
                 </strong>
                 <div>
                   <strong>{t('count')} </strong>
diff --git a/superset-frontend/plugins/legacy-plugin-chart-sunburst/src/Sunburst.js b/superset-frontend/plugins/legacy-plugin-chart-sunburst/src/Sunburst.js
index f967c985fcfd4..338753b678c8b 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-sunburst/src/Sunburst.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-sunburst/src/Sunburst.js
@@ -24,6 +24,7 @@ import {
   NumberFormats,
   CategoricalColorNamespace,
   getSequentialSchemeRegistry,
+  t,
 } from '@superset-ui/core';
 import wrapSvgText from './utils/wrapSvgText';
 
@@ -381,7 +382,8 @@ function Sunburst(element, props) {
       .append('text')
       .attr('class', 'path-abs-percent')
       .attr('y', yOffsets[offsetIndex])
-      .text(`${absolutePercString} of total`);
+      // eslint-disable-next-line prefer-template
+      .text(absolutePercString + ' ' + t('of total'));
 
     if (conditionalPercString) {
       offsetIndex += 1;
@@ -389,7 +391,8 @@ function Sunburst(element, props) {
         .append('text')
         .attr('class', 'path-cond-percent')
         .attr('y', yOffsets[offsetIndex])
-        .text(`${conditionalPercString} of parent`);
+        // eslint-disable-next-line prefer-template
+        .text(conditionalPercString + ' ' + t('of parent'));
     }
 
     offsetIndex += 1;
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx
index 32659bb20f613..21cd853b4636e 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Radar/controlPanel.tsx
@@ -51,7 +51,7 @@ const radarMetricMaxValue: { name: string; config: ControlFormItemSpec } = {
       'The maximum value of metrics. It is an optional configuration',
     ),
     width: 120,
-    placeholder: 'auto',
+    placeholder: t('auto'),
     debounceDelay: 400,
     validators: [validateNumber],
   },
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
index 2063ab95dee66..2d0b463c827b0 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
@@ -29,6 +29,7 @@ import {
   useTheme,
   isAdhocColumn,
   BinaryQueryObjectFilterClause,
+  t,
 } from '@superset-ui/core';
 import { PivotTable, sortAs, aggregatorTemplates } from './react-pivottable';
 import {
@@ -55,7 +56,7 @@ const PivotTableWrapper = styled.div`
   overflow: auto;
 `;
 
-const METRIC_KEY = 'metric';
+const METRIC_KEY = t('metric');
 const vals = ['value'];
 
 const StyledPlusSquareOutlined = styled(PlusSquareOutlined)`
diff --git a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.jsx b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.jsx
index ebfc4a2536640..576325a21ddec 100644
--- a/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.jsx
+++ b/superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.jsx
@@ -487,7 +487,9 @@ export class TableRenderer extends React.Component {
             true,
           )}
         >
-          {`Total (${this.props.aggregatorName})`}
+          {t('Total (%(aggregatorName)s)', {
+            aggregatorName: t(this.props.aggregatorName),
+          })}
         </th>
       ) : null;
 
@@ -550,7 +552,9 @@ export class TableRenderer extends React.Component {
           )}
         >
           {colAttrs.length === 0
-            ? `Total (${this.props.aggregatorName})`
+            ? t('Total (%(aggregatorName)s)', {
+                aggregatorName: t(this.props.aggregatorName),
+              })
             : null}
         </th>
       </tr>
@@ -764,10 +768,9 @@ export class TableRenderer extends React.Component {
           true,
         )}
       >
-        {
-          // eslint-disable-next-line prefer-template
-          t('Total') + ` (${this.props.aggregatorName})`
-        }
+        {t('Total (%(aggregatorName)s)', {
+          aggregatorName: t(this.props.aggregatorName),
+        })}
       </th>
     );
 
diff --git a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
index 989b121a3352a..48d4b9a66874e 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/DataTable/components/SelectPageSize.tsx
@@ -17,6 +17,7 @@
  * under the License.
  */
 import React from 'react';
+import { t } from '@superset-ui/core';
 import { formatSelectOptions } from '@superset-ui/chart-controls';
 
 export type SizeOption = [number, string];
@@ -34,7 +35,7 @@ function DefaultSelectRenderer({
 }: SelectPageSizeRendererProps) {
   return (
     <span className="dt-select-page-size form-inline">
-      Show{' '}
+      {t('Show')}{' '}
       <select
         className="form-control input-sm"
         value={current}
@@ -54,7 +55,7 @@ function DefaultSelectRenderer({
           );
         })}
       </select>{' '}
-      entries
+      {t('entries')}
     </span>
   );
 }
diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js
index d6447e808c607..57e052d5000ae 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.js
@@ -1402,7 +1402,7 @@ export function popQuery(queryId) {
           dbId: queryData.database.id,
           schema: queryData.schema,
           sql: queryData.sql,
-          name: `Copy of ${queryData.tab_name}`,
+          title: t('Copy of %s', queryData.tab_name),
           autorun: false,
         };
         return dispatch(addQueryEditor(queryEditorProps));
@@ -1419,7 +1419,8 @@ export function popDatasourceQuery(datasourceKey, sql) {
       .then(({ json }) =>
         dispatch(
           addQueryEditor({
-            name: `Query ${json.result.name}`,
+            // eslint-disable-next-line prefer-template
+            title: t('Query') + ` ${json.result.name}`,
             dbId: json.result.database.id,
             schema: json.result.schema,
             autorun: sql !== undefined,
diff --git a/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx b/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx
index 6168a2af713a4..806c35c155b20 100644
--- a/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx
@@ -28,7 +28,10 @@ interface QueryStateLabelProps {
 export default function QueryStateLabel({ query }: QueryStateLabelProps) {
   return (
     <Label className="m-r-3" type={STATE_TYPE_MAP[query.state]}>
-      {query.state}
+      {
+        // TODO: localize STATE_TYPE_MAP
+        query.state
+      }
     </Label>
   );
 }
diff --git a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
index 10cdd8a39e29f..dc7d90249848b 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
@@ -353,8 +353,8 @@ const ResultSet = ({
               message={t('%(rows)d rows returned', { rows })}
               onClose={() => setAlertIsOpen(false)}
               description={t(
-                'The number of rows displayed is limited to %s by the dropdown.',
-                rows,
+                'The number of rows displayed is limited to %(rows)d by the dropdown.',
+                { rows },
               )}
             />
           </div>
diff --git a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
index d8b2d5a0cfba8..7989e77af63af 100644
--- a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
@@ -145,7 +145,10 @@ const SouthPane = ({
   };
   const renderOfflineStatus = () => (
     <Label className="m-r-3" type={STATE_TYPE_MAP[STATUS_OPTIONS.offline]}>
-      {STATUS_OPTIONS.offline}
+      {
+        // TODO: localize STATUS_OPTIONS
+        STATUS_OPTIONS.offline
+      }
     </Label>
   );
 
diff --git a/superset-frontend/src/components/DatabaseSelector/index.tsx b/superset-frontend/src/components/DatabaseSelector/index.tsx
index 3b10e70f20901..e14bad09a89b3 100644
--- a/superset-frontend/src/components/DatabaseSelector/index.tsx
+++ b/superset-frontend/src/components/DatabaseSelector/index.tsx
@@ -248,7 +248,7 @@ export default function DatabaseSelector({
           setSchemaOptions(options);
           setLoadingSchemas(false);
           if (options.length === 1) changeSchema(options[0]);
-          if (refresh > 0) addSuccessToast('List refreshed');
+          if (refresh > 0) addSuccessToast(t('List refreshed'));
         })
         .catch(err => {
           setLoadingSchemas(false);
@@ -321,6 +321,7 @@ export default function DatabaseSelector({
         labelInValue
         loading={loadingSchemas}
         name="select-schema"
+        notFoundContent={t('No compatible schema found')}
         placeholder={t('Select schema or type schema name')}
         onChange={item => changeSchema(item as SchemaValue)}
         options={schemaOptions}
diff --git a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
index 9875a3c1f7c30..5ec5926808da8 100644
--- a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
@@ -190,7 +190,7 @@ const ChangeDatasourceModal: FunctionComponent<ChangeDatasourceModalProps> = ({
         );
       });
     onHide();
-    addSuccessToast('Successfully changed dataset!');
+    addSuccessToast(t('Successfully changed dataset!'));
   };
 
   const handlerCancelConfirm = () => {
diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
index 726cfaf615605..b0a0bb9c42f5f 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
@@ -177,6 +177,8 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
       content: renderSaveDialog(),
       onOk: onConfirmSave,
       icon: null,
+      okText: t('OK'),
+      cancelText: t('Cancel'),
     });
   };
 
diff --git a/superset-frontend/src/components/ListView/Filters/DateRange.tsx b/superset-frontend/src/components/ListView/Filters/DateRange.tsx
index 4dfaf11f79fdf..121131248f2d9 100644
--- a/superset-frontend/src/components/ListView/Filters/DateRange.tsx
+++ b/superset-frontend/src/components/ListView/Filters/DateRange.tsx
@@ -23,7 +23,7 @@ import React, {
   useImperativeHandle,
 } from 'react';
 import moment, { Moment } from 'moment';
-import { styled } from '@superset-ui/core';
+import { styled, t } from '@superset-ui/core';
 import { RangePicker } from 'src/components/DatePicker';
 import { FormLabel } from 'src/components/Form';
 import { BaseFilter, FilterHandler } from './Base';
@@ -64,6 +64,7 @@ function DateRangeFilter(
     <RangeFilterContainer>
       <FormLabel>{Header}</FormLabel>
       <RangePicker
+        placeholder={[t('Start date'), t('End date')]}
         showTime
         value={momentValue}
         onChange={momentRange => {
diff --git a/superset-frontend/src/components/Select/Select.tsx b/superset-frontend/src/components/Select/Select.tsx
index 5550463492231..d96b3ff231108 100644
--- a/superset-frontend/src/components/Select/Select.tsx
+++ b/superset-frontend/src/components/Select/Select.tsx
@@ -85,7 +85,7 @@ const Select = forwardRef(
       loading,
       mode = 'single',
       name,
-      notFoundContent,
+      notFoundContent = t('No data'),
       onChange,
       onClear,
       onDropdownVisibleChange,
diff --git a/superset-frontend/src/dashboard/actions/dashboardState.js b/superset-frontend/src/dashboard/actions/dashboardState.js
index 518dd7b5dc31f..9cd83e6da3d5f 100644
--- a/superset-frontend/src/dashboard/actions/dashboardState.js
+++ b/superset-frontend/src/dashboard/actions/dashboardState.js
@@ -647,7 +647,10 @@ export function maxUndoHistoryToast() {
 
     return dispatch(
       addWarningToast(
-        `You have used all ${historyLength} undo slots and will not be able to fully undo subsequent actions. You may save your current state to reset the history.`,
+        t(
+          'You have used all %(historyLength)s undo slots and will not be able to fully undo subsequent actions. You may save your current state to reset the history.',
+          { historyLength },
+        ),
       ),
     );
   };
diff --git a/superset-frontend/src/dashboard/components/SaveModal.tsx b/superset-frontend/src/dashboard/components/SaveModal.tsx
index 3cbaa40ba3532..dbdcb7b55200e 100644
--- a/superset-frontend/src/dashboard/components/SaveModal.tsx
+++ b/superset-frontend/src/dashboard/components/SaveModal.tsx
@@ -81,7 +81,7 @@ class SaveModal extends React.PureComponent<SaveModalProps, SaveModalState> {
     super(props);
     this.state = {
       saveType: props.saveType,
-      newDashName: `${props.dashboardTitle} [copy]`,
+      newDashName: props.dashboardTitle + t('[copy]'),
       duplicateSlices: false,
     };
 
diff --git a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
index 82c8994102533..8df5c2736e057 100644
--- a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
+++ b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
@@ -17,6 +17,7 @@
  * under the License.
  */
 import React from 'react';
+import { t } from '@superset-ui/core';
 import cx from 'classnames';
 
 import backgroundStyleOptions from 'src/dashboard/util/backgroundStyleOptions';
@@ -34,7 +35,10 @@ interface BackgroundStyleDropdownProps {
 function renderButton(option: OptionProps) {
   return (
     <div className={cx('background-style-option', option.className)}>
-      {`${option.label} background`}
+      {
+        // eslint-disable-next-line prefer-template
+        `${option.label} ` + t('background')
+      }
     </div>
   );
 }
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
index ed69c6734f1f6..fa0b4fbea09b2 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/DatasetSelect.tsx
@@ -90,6 +90,7 @@ const DatasetSelect = ({ onChange, value }: DatasetSelectProps) => {
       value={value}
       options={loadDatasetOptions}
       onChange={onChange}
+      notFoundContent={t('No compatible datasets found')}
     />
   );
 };
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
index d70679128e4cb..7edd0ca287850 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx
@@ -924,7 +924,9 @@ const FiltersConfigForm = (
                       <StyledRowFormItem
                         name={['filters', filterId, 'time_range']}
                         label={<StyledLabel>{t('Time range')}</StyledLabel>}
-                        initialValue={filterToEdit?.time_range || 'No filter'}
+                        initialValue={
+                          filterToEdit?.time_range || t('No filter')
+                        }
                         required={!hasAdhoc}
                         rules={[
                           {
diff --git a/superset-frontend/src/dashboard/stylesheets/components/column.less b/superset-frontend/src/dashboard/stylesheets/components/column.less
index 7d7b7baba3646..6a0c15b579012 100644
--- a/superset-frontend/src/dashboard/stylesheets/components/column.less
+++ b/superset-frontend/src/dashboard/stylesheets/components/column.less
@@ -49,6 +49,7 @@
 .grid-column--empty {
   min-height: 100px;
 
+  // TODO: localize content
   &:before {
     content: 'Empty column';
     position: absolute;
diff --git a/superset-frontend/src/dashboard/stylesheets/components/row.less b/superset-frontend/src/dashboard/stylesheets/components/row.less
index ec096d0bfa949..a4516dc39b10d 100644
--- a/superset-frontend/src/dashboard/stylesheets/components/row.less
+++ b/superset-frontend/src/dashboard/stylesheets/components/row.less
@@ -77,6 +77,7 @@
   align-items: center;
   height: 100px;
 
+  // TODO: localize content
   &:before {
     position: absolute;
     top: 0;
diff --git a/superset-frontend/src/dashboard/util/newComponentFactory.js b/superset-frontend/src/dashboard/util/newComponentFactory.js
index 8fddfda83c385..bec990b4e6600 100644
--- a/superset-frontend/src/dashboard/util/newComponentFactory.js
+++ b/superset-frontend/src/dashboard/util/newComponentFactory.js
@@ -46,7 +46,7 @@ const typeToDefaultMetaData = {
   },
   [DIVIDER_TYPE]: null,
   [HEADER_TYPE]: {
-    text: 'New header',
+    text: t('New header'),
     headerSize: MEDIUM_HEADER,
     background: BACKGROUND_TRANSPARENT,
   },
diff --git a/superset-frontend/src/explore/constants.ts b/superset-frontend/src/explore/constants.ts
index f45dbf2043594..cd038dac20ca3 100644
--- a/superset-frontend/src/explore/constants.ts
+++ b/superset-frontend/src/explore/constants.ts
@@ -56,33 +56,39 @@ export interface OperatorType {
 export const OPERATOR_ENUM_TO_OPERATOR_TYPE: {
   [key in Operators]: OperatorType;
 } = {
-  [Operators.EQUALS]: { display: 'Equal to (=)', operation: '==' },
-  [Operators.NOT_EQUALS]: { display: 'Not equal to (≠)', operation: '!=' },
-  [Operators.LESS_THAN]: { display: 'Less than (<)', operation: '<' },
+  [Operators.EQUALS]: { display: t('Equal to (=)'), operation: '==' },
+  [Operators.NOT_EQUALS]: { display: t('Not equal to (≠)'), operation: '!=' },
+  [Operators.LESS_THAN]: { display: t('Less than (<)'), operation: '<' },
   [Operators.LESS_THAN_OR_EQUAL]: {
-    display: 'Less or equal (<=)',
+    display: t('Less or equal (<=)'),
     operation: '<=',
   },
-  [Operators.GREATER_THAN]: { display: 'Greater than (>)', operation: '>' },
+  [Operators.GREATER_THAN]: { display: t('Greater than (>)'), operation: '>' },
   [Operators.GREATER_THAN_OR_EQUAL]: {
-    display: 'Greater or equal (>=)',
+    display: t('Greater or equal (>=)'),
     operation: '>=',
   },
-  [Operators.IN]: { display: 'In', operation: 'IN' },
-  [Operators.NOT_IN]: { display: 'Not in', operation: 'NOT IN' },
-  [Operators.LIKE]: { display: 'Like', operation: 'LIKE' },
-  [Operators.ILIKE]: { display: 'Like (case insensitive)', operation: 'ILIKE' },
-  [Operators.REGEX]: { display: 'Regex', operation: 'REGEX' },
-  [Operators.IS_NOT_NULL]: { display: 'Is not null', operation: 'IS NOT NULL' },
-  [Operators.IS_NULL]: { display: 'Is null', operation: 'IS NULL' },
+  [Operators.IN]: { display: t('In'), operation: 'IN' },
+  [Operators.NOT_IN]: { display: t('Not in'), operation: 'NOT IN' },
+  [Operators.LIKE]: { display: t('Like'), operation: 'LIKE' },
+  [Operators.ILIKE]: {
+    display: t('Like (case insensitive)'),
+    operation: 'ILIKE',
+  },
+  [Operators.REGEX]: { display: t('Regex'), operation: 'REGEX' },
+  [Operators.IS_NOT_NULL]: {
+    display: t('Is not null'),
+    operation: 'IS NOT NULL',
+  },
+  [Operators.IS_NULL]: { display: t('Is null'), operation: 'IS NULL' },
   [Operators.LATEST_PARTITION]: {
-    display: 'use latest_partition template',
+    display: t('use latest_partition template'),
     operation: 'LATEST PARTITION',
   },
-  [Operators.IS_TRUE]: { display: 'Is true', operation: '==' },
-  [Operators.IS_FALSE]: { display: 'Is false', operation: '==' },
+  [Operators.IS_TRUE]: { display: t('Is true'), operation: '==' },
+  [Operators.IS_FALSE]: { display: t('Is false'), operation: '==' },
   [Operators.TEMPORAL_RANGE]: {
-    display: 'TEMPORAL_RANGE',
+    display: t('TEMPORAL_RANGE'),
     operation: 'TEMPORAL_RANGE',
   },
 };
diff --git a/superset-frontend/src/utils/getChartRequiredFieldsMissingMessage.ts b/superset-frontend/src/utils/getChartRequiredFieldsMissingMessage.ts
index ac11e8503dc2f..746cf0936d53f 100644
--- a/superset-frontend/src/utils/getChartRequiredFieldsMissingMessage.ts
+++ b/superset-frontend/src/utils/getChartRequiredFieldsMissingMessage.ts
@@ -19,8 +19,12 @@
 
 import { t } from '@superset-ui/core';
 
+const CREATE_CHART = t('Create chart');
+const UPDATE_CHART = t('Update chart');
+
 export const getChartRequiredFieldsMissingMessage = (isCreating: boolean) =>
   t(
     'Select values in highlighted field(s) in the control panel. Then run the query by clicking on the %s button.',
-    isCreating ? '"Create chart"' : '"Update chart"',
+    // eslint-disable-next-line prefer-template
+    isCreating ? '"' + CREATE_CHART + '"' : '"' + UPDATE_CHART + '"',
   );
diff --git a/superset-frontend/src/views/CRUD/alert/AlertList.tsx b/superset-frontend/src/views/CRUD/alert/AlertList.tsx
index 826b5519f4a1a..1c34167652460 100644
--- a/superset-frontend/src/views/CRUD/alert/AlertList.tsx
+++ b/superset-frontend/src/views/CRUD/alert/AlertList.tsx
@@ -455,7 +455,7 @@ function AlertList({
         id: 'owners',
         input: 'select',
         operator: FilterOperator.relationManyMany,
-        unfilteredLabel: 'All',
+        unfilteredLabel: t('All'),
         fetchSelects: createFetchRelated(
           'report',
           'owners',
diff --git a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx
index 79a2d945fe858..f5bea2038515e 100644
--- a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx
+++ b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx
@@ -614,6 +614,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
             return;
           }
 
+          // TODO: localize data.type
           addSuccessToast(t('%s updated', data.type));
 
           if (onAdd) {
@@ -630,6 +631,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
           return;
         }
 
+        // TODO: localize data.type
         addSuccessToast(t('%s updated', data.type));
 
         if (onAdd) {
diff --git a/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx b/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx
index 85e248c470bcf..060439eb4b0e7 100644
--- a/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx
+++ b/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx
@@ -165,7 +165,14 @@ function ExecutionLog({ addDangerToast, isReportEnabled }: ExecutionLogProps) {
         name={
           <StyledHeader>
             <span>
-              {alertResource?.type} {alertResource?.name}
+              {alertResource
+                ? alertResource.type === 'Alert'
+                  ? t('Alert:')
+                  : alertResource.type === 'Report'
+                  ? t('Report:')
+                  : null
+                : null}{' '}
+              {alertResource?.name}
             </span>
             <span>
               <Link to={path}>{t('Back to all')}</Link>
diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
index 6d438c8d594ea..81225fedaa5e5 100644
--- a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
+++ b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx
@@ -304,6 +304,7 @@ const AnnotationModal: FunctionComponent<AnnotationModalProps> = ({
           <span className="required">*</span>
         </div>
         <RangePicker
+          placeholder={[t('Start date'), t('End date')]}
           format="YYYY-MM-DD HH:mm"
           onChange={onDateChange}
           showTime={{ format: 'hh:mm a' }}
diff --git a/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx b/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx
index ff583e6b9b60e..3f4e1cd66c0e5 100644
--- a/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx
+++ b/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayersList.tsx
@@ -285,7 +285,7 @@ function AnnotationLayersList({
         id: 'created_by',
         input: 'select',
         operator: FilterOperator.relationOneMany,
-        unfilteredLabel: 'All',
+        unfilteredLabel: t('All'),
         fetchSelects: createFetchRelated(
           'annotation_layer',
           'created_by',
diff --git a/superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx b/superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx
index 36990c330aecc..253a4f4cdf1be 100644
--- a/superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx
+++ b/superset-frontend/src/views/CRUD/csstemplates/CssTemplatesList.tsx
@@ -275,7 +275,7 @@ function CssTemplatesList({
         id: 'created_by',
         input: 'select',
         operator: FilterOperator.relationOneMany,
-        unfilteredLabel: 'All',
+        unfilteredLabel: t('All'),
         fetchSelects: createFetchRelated(
           'css_template',
           'created_by',
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
index 5870345b444fe..f440c93090d1b 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/EncryptedField.tsx
@@ -117,7 +117,9 @@ export const EncryptedField = ({
             name={encryptedField}
             value={encryptedValue}
             onChange={changeMethods.onParametersChange}
-            placeholder="Paste content of service credentials JSON file here"
+            placeholder={t(
+              'Paste content of service credentials JSON file here',
+            )}
           />
           <span className="label-paste">
             {t('Copy and paste the entire service account .json file here')}
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx
index 93ba1f2d1ffe9..76e1889fb9944 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx
@@ -26,14 +26,14 @@ const FIELD_TEXT_MAP = {
     helpText: t(
       'Copy the account name of that database you are trying to connect to.',
     ),
-    placeholder: 'e.g. world_population',
+    placeholder: t('e.g. world_population'),
   },
   warehouse: {
-    placeholder: 'e.g. compute_wh',
+    placeholder: t('e.g. world_population'),
     className: 'form-group-w-50',
   },
   role: {
-    placeholder: 'e.g. AccountAdmin',
+    placeholder: t('e.g. AccountAdmin'),
     className: 'form-group-w-50',
   },
 };
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/SSHTunnelForm.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/SSHTunnelForm.tsx
index d73c00265d0a4..361784a281dde 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/SSHTunnelForm.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/SSHTunnelForm.tsx
@@ -193,11 +193,11 @@ const SSHTunnelForm = ({
                     data-test="ssh-tunnel-password-input"
                     iconRender={visible =>
                       visible ? (
-                        <Tooltip title="Hide password.">
+                        <Tooltip title={t('Hide password.')}>
                           <EyeInvisibleOutlined />
                         </Tooltip>
                       ) : (
-                        <Tooltip title="Show password.">
+                        <Tooltip title={t('Show password.')}>
                           <EyeOutlined />
                         </Tooltip>
                       )
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index 5f85ae098502f..062bad22620ed 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -1207,7 +1207,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           required
           validationMethods={{ onBlur: () => {} }}
           errorMessage={validationErrors?.confirm_overwrite}
-          label={t(`TYPE "OVERWRITE" TO CONFIRM`)}
+          label={t('Type "%s" to confirm', t('OVERWRITE'))}
           onChange={confirmOverwrite}
           css={formScrollableStyles}
         />
@@ -1604,7 +1604,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
               <Alert
                 closable={false}
                 css={(theme: SupersetTheme) => antDAlertStyles(theme)}
-                message="Additional fields may be required"
+                message={t('Additional fields may be required')}
                 showIcon
                 description={
                   <>
diff --git a/superset-frontend/src/views/CRUD/data/query/QueryList.tsx b/superset-frontend/src/views/CRUD/data/query/QueryList.tsx
index dbe8e259dacce..ff7a268f20b97 100644
--- a/superset-frontend/src/views/CRUD/data/query/QueryList.tsx
+++ b/superset-frontend/src/views/CRUD/data/query/QueryList.tsx
@@ -351,7 +351,7 @@ function QueryList({ addDangerToast }: QueryListProps) {
         id: 'database',
         input: 'select',
         operator: FilterOperator.relationOneMany,
-        unfilteredLabel: 'All',
+        unfilteredLabel: t('All'),
         fetchSelects: createFetchRelated(
           'query',
           'database',
diff --git a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx
index ca2f26e61af03..291063aa88b1a 100644
--- a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx
+++ b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryList.tsx
@@ -427,7 +427,7 @@ function SavedQueryList({
         id: 'database',
         input: 'select',
         operator: FilterOperator.relationOneMany,
-        unfilteredLabel: 'All',
+        unfilteredLabel: t('All'),
         fetchSelects: createFetchRelated(
           'saved_query',
           'database',
diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts
index 18d87e600dee0..de99cba6f5077 100644
--- a/superset-frontend/src/views/CRUD/hooks.ts
+++ b/superset-frontend/src/views/CRUD/hooks.ts
@@ -420,6 +420,10 @@ export function useImportResource(
       const formData = new FormData();
       formData.append('formData', bundle);
 
+      const reexportText = t(
+        'Please re-export your file and try importing again',
+      );
+
       /* The import bundle never contains database passwords; if required
        * they should be provided by the user during import.
        */
@@ -468,7 +472,7 @@ export function useImportResource(
                   resourceLabel,
                   [
                     ...error.errors.map(payload => payload.message),
-                    t('Please re-export your file and try importing again.'),
+                    reexportText,
                   ].join('.\n'),
                 ),
               );
diff --git a/superset-frontend/src/views/CRUD/welcome/EmptyState.tsx b/superset-frontend/src/views/CRUD/welcome/EmptyState.tsx
index 702833c394331..9427c537dd564 100644
--- a/superset-frontend/src/views/CRUD/welcome/EmptyState.tsx
+++ b/superset-frontend/src/views/CRUD/welcome/EmptyState.tsx
@@ -30,6 +30,13 @@ const welcomeTableLabels: Record<WelcomeTable, string> = {
   [WelcomeTable.SavedQueries]: t('saved queries'),
 };
 
+const welcomeTableEmpty: Record<WelcomeTable, string> = {
+  [WelcomeTable.Charts]: t('No charts yet'),
+  [WelcomeTable.Dashboards]: t('No dashboards yet'),
+  [WelcomeTable.Recents]: t('No recents yet'),
+  [WelcomeTable.SavedQueries]: t('No saved queries yet'),
+};
+
 export interface EmptyStateProps {
   tableName: WelcomeTable;
   tab?: string;
@@ -75,11 +82,7 @@ export default function EmptyState({
     [WelcomeTable.Recents]: 'union.svg',
     [WelcomeTable.SavedQueries]: 'empty-queries.svg',
   };
-  const mine = (
-    <span>
-      {t('No %(tableName)s yet', { tableName: welcomeTableLabels[tableName] })}
-    </span>
-  );
+  const mine = <span>{welcomeTableEmpty[tableName]}</span>;
   const recent = (
     <span className="no-recents">
       {(() => {
diff --git a/superset/annotation_layers/annotations/schemas.py b/superset/annotation_layers/annotations/schemas.py
index 5e0bac56f73e0..384872d8dcf3e 100644
--- a/superset/annotation_layers/annotations/schemas.py
+++ b/superset/annotation_layers/annotations/schemas.py
@@ -16,6 +16,7 @@
 # under the License.
 from typing import Union
 
+from flask_babel import lazy_gettext as _
 from marshmallow import fields, Schema, ValidationError
 from marshmallow.validate import Length
 
@@ -52,7 +53,7 @@ def validate_json(value: Union[bytes, bytearray, str]) -> None:
     try:
         utils.validate_json(value)
     except SupersetException as ex:
-        raise ValidationError("JSON not valid") from ex
+        raise ValidationError(_("JSON not valid")) from ex
 
 
 class AnnotationPostSchema(Schema):
diff --git a/superset/charts/post_processing.py b/superset/charts/post_processing.py
index ffd8becddea62..4998c2927cca8 100644
--- a/superset/charts/post_processing.py
+++ b/superset/charts/post_processing.py
@@ -30,6 +30,7 @@
 from typing import Any, Dict, List, Optional, Tuple, TYPE_CHECKING
 
 import pandas as pd
+from flask_babel import gettext as __, lazy_gettext as _
 
 from superset.common.chart_data import ChartDataResultFormat
 from superset.utils.core import (
@@ -68,7 +69,7 @@ def pivot_df(  # pylint: disable=too-many-locals, too-many-arguments, too-many-s
     show_columns_total: bool = False,
     apply_metrics_on_rows: bool = False,
 ) -> pd.DataFrame:
-    metric_name = f"Total ({aggfunc})"
+    metric_name = _("Total (%(aggfunc)s)", aggfunc=aggfunc)
 
     if transpose_pivot:
         rows, columns = columns, rows
@@ -156,7 +157,7 @@ def pivot_df(  # pylint: disable=too-many-locals, too-many-arguments, too-many-s
                 slice_ = df.columns.get_loc(subgroup)
                 subtotal = pivot_v2_aggfunc_map[aggfunc](df.iloc[:, slice_], axis=1)
                 depth = df.columns.nlevels - len(subgroup) - 1
-                total = metric_name if level == 0 else "Subtotal"
+                total = metric_name if level == 0 else __("Subtotal")
                 subtotal_name = tuple([*subgroup, total, *([""] * depth)])
                 # insert column after subgroup
                 df.insert(int(slice_.stop), subtotal_name, subtotal)
@@ -173,7 +174,7 @@ def pivot_df(  # pylint: disable=too-many-locals, too-many-arguments, too-many-s
                     df.iloc[slice_, :].apply(pd.to_numeric), axis=0
                 )
                 depth = df.index.nlevels - len(subgroup) - 1
-                total = metric_name if level == 0 else "Subtotal"
+                total = metric_name if level == 0 else __("Subtotal")
                 subtotal.name = tuple([*subgroup, total, *([""] * depth)])
                 # insert row after subgroup
                 df = pd.concat(
diff --git a/superset/commands/importers/v1/__init__.py b/superset/commands/importers/v1/__init__.py
index c620ec9f2ac85..2d5660abb5b6d 100644
--- a/superset/commands/importers/v1/__init__.py
+++ b/superset/commands/importers/v1/__init__.py
@@ -16,6 +16,7 @@
 # under the License.
 from typing import Any, Dict, List, Optional, Set
 
+from flask_babel import lazy_gettext as _
 from marshmallow import Schema, validate
 from marshmallow.exceptions import ValidationError
 from sqlalchemy.orm import Session
@@ -90,7 +91,9 @@ def validate(self) -> None:
         self._prevent_overwrite_existing_model(exceptions)
 
         if exceptions:
-            exception = CommandInvalidError(f"Error importing {self.model_name}")
+            exception = CommandInvalidError(
+                _("Error importing %(model_name)s.", model_name=self.model_name)
+            )
             exception.add_list(exceptions)
             raise exception
 
@@ -108,10 +111,11 @@ def _prevent_overwrite_existing_model(  # pylint: disable=invalid-name
                     exceptions.append(
                         ValidationError(
                             {
-                                file_name: (
-                                    f"{self.model_name.title()} already exists "
-                                    "and `overwrite=true` was not passed"
-                                ),
+                                file_name: _(
+                                    "%(model_name)s already exists "
+                                    "and `overwrite=true` was not passed",
+                                    model_name=self.model_name.title(),
+                                )
                             }
                         )
                     )
diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
index a03f088c07b7a..56fd9bc3d5427 100644
--- a/superset/connectors/base/models.py
+++ b/superset/connectors/base/models.py
@@ -22,6 +22,7 @@
 from typing import Any, Dict, Hashable, List, Optional, Set, Type, TYPE_CHECKING, Union
 
 from flask_appbuilder.security.sqla.models import User
+from flask_babel import gettext as __
 from sqlalchemy import and_, Boolean, Column, Integer, String, Text
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import foreign, Query, relationship, RelationshipProperty, Session
@@ -248,10 +249,10 @@ def data(self) -> Dict[str, Any]:
         for column_name in self.column_names:
             column_name = str(column_name or "")
             order_by_choices.append(
-                (json.dumps([column_name, True]), column_name + " [asc]")
+                (json.dumps([column_name, True]), column_name + __(" [asc]"))
             )
             order_by_choices.append(
-                (json.dumps([column_name, False]), column_name + " [desc]")
+                (json.dumps([column_name, False]), column_name + __(" [desc]"))
             )
 
         verbose_map = {"__timestamp": "Time"}
diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py
index d3a9444980966..7b6e7a1f0f1d1 100644
--- a/superset/dashboards/schemas.py
+++ b/superset/dashboards/schemas.py
@@ -18,6 +18,7 @@
 import re
 from typing import Any, Dict, Union
 
+from flask_babel import lazy_gettext as _
 from marshmallow import fields, post_load, Schema
 from marshmallow.validate import Length, ValidationError
 
@@ -92,7 +93,7 @@ def validate_json(value: Union[bytes, bytearray, str]) -> None:
     try:
         utils.validate_json(value)
     except SupersetException as ex:
-        raise ValidationError("JSON not valid") from ex
+        raise ValidationError(_("JSON not valid")) from ex
 
 
 def validate_json_metadata(value: Union[bytes, bytearray, str]) -> None:
@@ -101,7 +102,7 @@ def validate_json_metadata(value: Union[bytes, bytearray, str]) -> None:
     try:
         value_obj = json.loads(value)
     except json.decoder.JSONDecodeError as ex:
-        raise ValidationError("JSON not valid") from ex
+        raise ValidationError(_("JSON not valid")) from ex
     errors = DashboardJSONMetadataSchema().validate(value_obj, partial=False)
     if errors:
         raise ValidationError(errors)
diff --git a/superset/databases/schemas.py b/superset/databases/schemas.py
index 8ad2ab706fb2f..4be24b4c42f3c 100644
--- a/superset/databases/schemas.py
+++ b/superset/databases/schemas.py
@@ -52,7 +52,7 @@
 )
 expose_in_sqllab_description = "Expose this database to SQLLab"
 allow_run_async_description = (
-    "Operate the database in asynchronous mode, meaning  "
+    "Operate the database in asynchronous mode, meaning "
     "that the queries are executed on remote workers as opposed "
     "to on the web server itself. "
     "This assumes that you have a Celery worker setup as well "
diff --git a/superset/errors.py b/superset/errors.py
index 2df0eb82b26e0..4d41bcfdc5889 100644
--- a/superset/errors.py
+++ b/superset/errors.py
@@ -18,7 +18,7 @@
 from enum import Enum
 from typing import Any, Dict, Optional
 
-from flask_babel import lazy_gettext as _
+from flask_babel import gettext as __, lazy_gettext as _
 
 
 class SupersetErrorType(str, Enum):
@@ -95,54 +95,54 @@ class SupersetErrorType(str, Enum):
 
 
 ISSUE_CODES = {
-    1000: _("The datasource is too large to query."),
-    1001: _("The database is under an unusual load."),
-    1002: _("The database returned an unexpected error."),
-    1003: _(
+    1000: __("The datasource is too large to query."),
+    1001: __("The database is under an unusual load."),
+    1002: __("The database returned an unexpected error."),
+    1003: __(
         "There is a syntax error in the SQL query. "
         "Perhaps there was a misspelling or a typo."
     ),
-    1004: _("The column was deleted or renamed in the database."),
-    1005: _("The table was deleted or renamed in the database."),
-    1006: _("One or more parameters specified in the query are missing."),
-    1007: _("The hostname provided can't be resolved."),
-    1008: _("The port is closed."),
-    1009: _("The host might be down, and can't be reached on the provided port."),
-    1010: _("Superset encountered an error while running a command."),
-    1011: _("Superset encountered an unexpected error."),
-    1012: _("The username provided when connecting to a database is not valid."),
-    1013: _("The password provided when connecting to a database is not valid."),
-    1014: _("Either the username or the password is wrong."),
-    1015: _("Either the database is spelled incorrectly or does not exist."),
-    1016: _("The schema was deleted or renamed in the database."),
-    1017: _("User doesn't have the proper permissions."),
-    1018: _("One or more parameters needed to configure a database are missing."),
-    1019: _("The submitted payload has the incorrect format."),
-    1020: _("The submitted payload has the incorrect schema."),
-    1021: _("Results backend needed for asynchronous queries is not configured."),
-    1022: _("Database does not allow data manipulation."),
-    1023: _(
+    1004: __("The column was deleted or renamed in the database."),
+    1005: __("The table was deleted or renamed in the database."),
+    1006: __("One or more parameters specified in the query are missing."),
+    1007: __("The hostname provided can't be resolved."),
+    1008: __("The port is closed."),
+    1009: __("The host might be down, and can't be reached on the provided port."),
+    1010: __("Superset encountered an error while running a command."),
+    1011: __("Superset encountered an unexpected error."),
+    1012: __("The username provided when connecting to a database is not valid."),
+    1013: __("The password provided when connecting to a database is not valid."),
+    1014: __("Either the username or the password is wrong."),
+    1015: __("Either the database is spelled incorrectly or does not exist."),
+    1016: __("The schema was deleted or renamed in the database."),
+    1017: __("User doesn't have the proper permissions."),
+    1018: __("One or more parameters needed to configure a database are missing."),
+    1019: __("The submitted payload has the incorrect format."),
+    1020: __("The submitted payload has the incorrect schema."),
+    1021: __("Results backend needed for asynchronous queries is not configured."),
+    1022: __("Database does not allow data manipulation."),
+    1023: __(
         "The CTAS (create table as select) doesn't have a "
         "SELECT statement at the end. Please make sure your query has a "
         "SELECT as its last statement. Then, try running your query again."
     ),
-    1024: _("CVAS (create view as select) query has more than one statement."),
-    1025: _("CVAS (create view as select) query is not a SELECT statement."),
-    1026: _("Query is too complex and takes too long to run."),
-    1027: _("The database is currently running too many queries."),
-    1028: _("One or more parameters specified in the query are malformatted."),
-    1029: _("The object does not exist in the given database."),
-    1030: _("The query has a syntax error."),
-    1031: _("The results backend no longer has the data from the query."),
-    1032: _("The query associated with the results was deleted."),
-    1033: _(
+    1024: __("CVAS (create view as select) query has more than one statement."),
+    1025: __("CVAS (create view as select) query is not a SELECT statement."),
+    1026: __("Query is too complex and takes too long to run."),
+    1027: __("The database is currently running too many queries."),
+    1028: __("One or more parameters specified in the query are malformatted."),
+    1029: __("The object does not exist in the given database."),
+    1030: __("The query has a syntax error."),
+    1031: __("The results backend no longer has the data from the query."),
+    1032: __("The query associated with the results was deleted."),
+    1033: __(
         "The results stored in the backend were stored in a "
         "different format, and no longer can be deserialized."
     ),
-    1034: _("The port number is invalid."),
-    1035: _("Failed to start remote query on a worker."),
-    1036: _("The database was deleted."),
-    1037: _("Custom SQL fields cannot contain sub-queries."),
+    1034: __("The port number is invalid."),
+    1035: __("Failed to start remote query on a worker."),
+    1036: __("The database was deleted."),
+    1037: __("Custom SQL fields cannot contain sub-queries."),
 }
 
 
@@ -220,7 +220,11 @@ def __post_init__(self) -> None:
                         {
                             "code": issue_code,
                             "message": (
-                                f"Issue {issue_code} - {ISSUE_CODES[issue_code]}"
+                                _(
+                                    "Issue %(issue_code)s - %(issue_msg)s",
+                                    issue_code=issue_code,
+                                    issue_msg=ISSUE_CODES[issue_code],
+                                )
                             ),
                         }
                         for issue_code in issue_codes
diff --git a/superset/models/sql_lab.py b/superset/models/sql_lab.py
index babea35baf39b..460406e6837e2 100644
--- a/superset/models/sql_lab.py
+++ b/superset/models/sql_lab.py
@@ -26,6 +26,7 @@
 from flask import current_app, Markup
 from flask_appbuilder import Model
 from flask_appbuilder.models.decorators import renders
+from flask_babel import gettext as __
 from humanize import naturaltime
 from sqlalchemy import (
     Boolean,
@@ -224,10 +225,10 @@ def data(self) -> Dict[str, Any]:
         for col in self.columns:
             column_name = str(col.get("column_name") or "")
             order_by_choices.append(
-                (json.dumps([column_name, True]), column_name + " [asc]")
+                (json.dumps([column_name, True]), column_name + __(" [asc]"))
             )
             order_by_choices.append(
-                (json.dumps([column_name, False]), column_name + " [desc]")
+                (json.dumps([column_name, False]), column_name + __(" [desc]"))
             )
 
         return {
diff --git a/superset/reports/dao.py b/superset/reports/dao.py
index be5ee8053c48b..22bf5c4b48b12 100644
--- a/superset/reports/dao.py
+++ b/superset/reports/dao.py
@@ -20,6 +20,7 @@
 from typing import Any, Dict, List, Optional
 
 from flask_appbuilder import Model
+from flask_babel import lazy_gettext as _
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
@@ -39,7 +40,7 @@
 logger = logging.getLogger(__name__)
 
 
-REPORT_SCHEDULE_ERROR_NOTIFICATION_MARKER = "Notification sent with error"
+REPORT_SCHEDULE_ERROR_NOTIFICATION_MARKER = _("Notification sent with error")
 
 
 class ReportScheduleDAO(BaseDAO):
diff --git a/superset/sql_lab.py b/superset/sql_lab.py
index c8b3bca2b1ebb..149feb163926c 100644
--- a/superset/sql_lab.py
+++ b/superset/sql_lab.py
@@ -485,7 +485,11 @@ def execute_sql_statements(  # pylint: disable=too-many-arguments, too-many-loca
                 or (query.ctas_method == CtasMethod.TABLE and i == len(statements) - 1)
             )
             # Run statement
-            msg = f"Running statement {i+1} out of {statement_count}"
+            msg = __(
+                "Running statement %(statement_num)s out of %(statement_count)s",
+                statement_num=i + 1,
+                statement_count=statement_count,
+            )
             logger.info("Query %s: %s", str(query_id), msg)
             query.set_extra_json_key("progress", msg)
             session.commit()
@@ -504,7 +508,11 @@ def execute_sql_statements(  # pylint: disable=too-many-arguments, too-many-loca
             except Exception as ex:  # pylint: disable=broad-except
                 msg = str(ex)
                 prefix_message = (
-                    f"[Statement {i+1} out of {statement_count}]"
+                    __(
+                        "Statement %(statement_num)s out of %(statement_count)s",
+                        statement_num=i + 1,
+                        statement_count=statement_count,
+                    )
                     if statement_count > 1
                     else ""
                 )
diff --git a/superset/sqllab/exceptions.py b/superset/sqllab/exceptions.py
index cac462585ad49..c0096d5db6b47 100644
--- a/superset/sqllab/exceptions.py
+++ b/superset/sqllab/exceptions.py
@@ -19,11 +19,11 @@
 import os
 from typing import Optional, TYPE_CHECKING
 
+from flask_babel import lazy_gettext as _
+
 from superset.errors import SupersetError, SupersetErrorType
 from superset.exceptions import SupersetException
 
-MSG_FORMAT = "Failed to execute {}"
-
 if TYPE_CHECKING:
     from superset.sqllab.sqllab_execution_context import SqlJsonExecutionContext
 
@@ -61,7 +61,10 @@ def __init__(  # pylint: disable=too-many-arguments
         super().__init__(self._generate_message(), exception, error_type)
 
     def _generate_message(self) -> str:
-        msg = MSG_FORMAT.format(self.sql_json_execution_context.get_query_details())
+        msg = _(
+            "Failed to execute %(query)s",
+            query=self.sql_json_execution_context.get_query_details(),
+        )
         if self.failed_reason_msg:
             msg = msg + self.failed_reason_msg
         if self.suggestion_help_msg is not None:
diff --git a/superset/sqllab/query_render.py b/superset/sqllab/query_render.py
index df631784e35b1..2bf93350d1db5 100644
--- a/superset/sqllab/query_render.py
+++ b/superset/sqllab/query_render.py
@@ -29,7 +29,9 @@
 from superset.sqllab.exceptions import SqlLabException
 from superset.utils import core as utils
 
-MSG_OF_1006 = "Issue 1006 - One or more parameters specified in the query are missing."
+MSG_OF_1006 = __(
+    "Issue 1006 - One or more parameters specified in the query are missing."
+)
 
 if TYPE_CHECKING:
     from superset.jinja_context import BaseTemplateProcessor
diff --git a/superset/utils/date_parser.py b/superset/utils/date_parser.py
index 00e6c7a2b442f..7e79c72f1eb78 100644
--- a/superset/utils/date_parser.py
+++ b/superset/utils/date_parser.py
@@ -178,7 +178,7 @@ def get_since_until(  # pylint: disable=too-many-arguments,too-many-locals,too-m
     _relative_start = relative_start if relative_start else "today"
     _relative_end = relative_end if relative_end else "today"
 
-    if time_range == NO_TIME_RANGE:
+    if time_range == NO_TIME_RANGE or time_range == _(NO_TIME_RANGE):
         return None, None
 
     if time_range and time_range.startswith("Last") and separator not in time_range:
diff --git a/superset/utils/encrypt.py b/superset/utils/encrypt.py
index bd78b10f7fcab..0c230c6cd9248 100644
--- a/superset/utils/encrypt.py
+++ b/superset/utils/encrypt.py
@@ -19,6 +19,7 @@
 from typing import Any, Dict, List, Optional
 
 from flask import Flask
+from flask_babel import lazy_gettext as _
 from sqlalchemy import text, TypeDecorator
 from sqlalchemy.engine import Connection, Dialect, Row
 from sqlalchemy_utils import EncryptedType
@@ -109,7 +110,13 @@ def _read_bytes(col_name: str, value: Any) -> Optional[bytes]:
             return bytes(value.encode("utf8"))
 
         # Just bail if we haven't seen this type before...
-        raise ValueError(f"DB column {col_name} has unknown type: {type(value)}")
+        raise ValueError(
+            _(
+                "DB column %(col_name)s has unknown type: %(value_type)s",
+                col_name=col_name,
+                value_type=type(value),
+            )
+        )
 
     @staticmethod
     def _select_columns_from_table(
diff --git a/superset/utils/schema.py b/superset/utils/schema.py
index c082ae017c211..819269d619914 100644
--- a/superset/utils/schema.py
+++ b/superset/utils/schema.py
@@ -16,6 +16,7 @@
 # under the License.
 from typing import Any, Union
 
+from flask_babel import lazy_gettext as _
 from marshmallow import validate, ValidationError
 
 from superset.exceptions import SupersetException
@@ -51,4 +52,4 @@ def validate_json(value: Union[bytes, bytearray, str]) -> None:
     try:
         utils.validate_json(value)
     except SupersetException as ex:
-        raise ValidationError("JSON not valid") from ex
+        raise ValidationError(_("JSON not valid")) from ex
diff --git a/superset/views/api.py b/superset/views/api.py
index bde25236460da..fc7c5b76d26c1 100644
--- a/superset/views/api.py
+++ b/superset/views/api.py
@@ -23,6 +23,7 @@
 from flask_appbuilder import expose
 from flask_appbuilder.api import rison
 from flask_appbuilder.security.decorators import has_access_api
+from flask_babel import lazy_gettext as _
 
 from superset import db, event_logger
 from superset.charts.commands.exceptions import (
@@ -105,7 +106,7 @@ def time_range(self, **kwargs: Any) -> FlaskResponse:
             }
             return self.json_response({"result": result})
         except (ValueError, TimeRangeParseFailError, TimeRangeAmbiguousError) as error:
-            error_msg = {"message": f"Unexpected time range: {error}"}
+            error_msg = {"message": _("Unexpected time range: %s" % error)}
             return self.json_response(error_msg, 400)
 
     def get_query_context_factory(self) -> QueryContextFactory:
diff --git a/superset/views/dashboard/mixin.py b/superset/views/dashboard/mixin.py
index 43e4df1c0af3d..d8838b26c9d30 100644
--- a/superset/views/dashboard/mixin.py
+++ b/superset/views/dashboard/mixin.py
@@ -66,7 +66,7 @@ class DashboardMixin:  # pylint: disable=too-few-public-methods
         "roles": _(
             "Roles is a list which defines access to the dashboard. "
             "Granting a role access to a dashboard will bypass dataset level checks."
-            "If no roles defined then the dashboard is available to all roles."
+            "If no roles are defined then the dashboard is available to all roles."
         ),
         "published": _(
             "Determines whether or not this dashboard is "
diff --git a/superset/views/database/mixins.py b/superset/views/database/mixins.py
index bd83e79439c95..efd0b6c6eb25e 100644
--- a/superset/views/database/mixins.py
+++ b/superset/views/database/mixins.py
@@ -102,7 +102,7 @@ class DatabaseMixin:
         ),
         "expose_in_sqllab": _("Expose this DB in SQL Lab"),
         "allow_run_async": _(
-            "Operate the database in asynchronous mode, meaning  "
+            "Operate the database in asynchronous mode, meaning "
             "that the queries are executed on remote workers as opposed "
             "to on the web server itself. "
             "This assumes that you have a Celery worker setup as well "
diff --git a/superset/views/database/views.py b/superset/views/database/views.py
index 62f7d45d3ab62..5f94fe6fc8737 100644
--- a/superset/views/database/views.py
+++ b/superset/views/database/views.py
@@ -25,7 +25,7 @@
 from flask_appbuilder import expose, SimpleFormView
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 from flask_appbuilder.security.decorators import has_access
-from flask_babel import gettext as __, lazy_gettext as _
+from flask_babel import lazy_gettext as _
 from werkzeug.wrappers import Response
 from wtforms.fields import StringField
 from wtforms.validators import ValidationError
@@ -176,7 +176,7 @@ def form_post(self, form: CsvToDatabaseForm) -> Response:
         delimiter_input = form.delimiter.data
 
         if not schema_allows_file_upload(database, csv_table.schema):
-            message = __(
+            message = _(
                 'Database "%(database_name)s" schema "%(schema_name)s" '
                 "is not allowed for csv uploads. Please contact your Superset Admin.",
                 database_name=database.database_name,
@@ -265,7 +265,7 @@ def form_post(self, form: CsvToDatabaseForm) -> Response:
             db.session.commit()
         except Exception as ex:  # pylint: disable=broad-except
             db.session.rollback()
-            message = __(
+            message = _(
                 'Unable to upload CSV file "%(filename)s" to table '
                 '"%(table_name)s" in database "%(db_name)s". '
                 "Error message: %(error_msg)s",
@@ -280,7 +280,7 @@ def form_post(self, form: CsvToDatabaseForm) -> Response:
             return redirect("/csvtodatabaseview/form")
 
         # Go back to welcome page / splash screen
-        message = __(
+        message = _(
             'CSV file "%(csv_filename)s" uploaded to table "%(table_name)s" in '
             'database "%(db_name)s"',
             csv_filename=form.csv_file.data.filename,
@@ -315,7 +315,7 @@ def form_post(self, form: ExcelToDatabaseForm) -> Response:
         excel_table = Table(table=form.name.data, schema=form.schema.data)
 
         if not schema_allows_file_upload(database, excel_table.schema):
-            message = __(
+            message = _(
                 'Database "%(database_name)s" schema "%(schema_name)s" '
                 "is not allowed for excel uploads. Please contact your Superset Admin.",
                 database_name=database.database_name,
@@ -402,7 +402,7 @@ def form_post(self, form: ExcelToDatabaseForm) -> Response:
             db.session.commit()
         except Exception as ex:  # pylint: disable=broad-except
             db.session.rollback()
-            message = __(
+            message = _(
                 'Unable to upload Excel file "%(filename)s" to table '
                 '"%(table_name)s" in database "%(db_name)s". '
                 "Error message: %(error_msg)s",
@@ -417,7 +417,7 @@ def form_post(self, form: ExcelToDatabaseForm) -> Response:
             return redirect("/exceltodatabaseview/form")
 
         # Go back to welcome page / splash screen
-        message = __(
+        message = _(
             'Excel file "%(excel_filename)s" uploaded to table "%(table_name)s" in '
             'database "%(db_name)s"',
             excel_filename=form.excel_file.data.filename,
@@ -462,7 +462,7 @@ def form_post(  # pylint: disable=too-many-locals
             ]
 
         if len(file_type) > 1:
-            message = __(
+            message = _(
                 "Multiple file extensions are not allowed for columnar uploads."
                 " Please make sure all files are of the same extension.",
             )
@@ -475,7 +475,7 @@ def form_post(  # pylint: disable=too-many-locals
         }
 
         if not schema_allows_file_upload(database, columnar_table.schema):
-            message = __(
+            message = _(
                 'Database "%(database_name)s" schema "%(schema_name)s" '
                 "is not allowed for columnar uploads. "
                 "Please contact your Superset Admin.",
@@ -543,7 +543,7 @@ def form_post(  # pylint: disable=too-many-locals
             db.session.commit()
         except Exception as ex:  # pylint: disable=broad-except
             db.session.rollback()
-            message = __(
+            message = _(
                 'Unable to upload Columnar file "%(filename)s" to table '
                 '"%(table_name)s" in database "%(db_name)s". '
                 "Error message: %(error_msg)s",
@@ -558,7 +558,7 @@ def form_post(  # pylint: disable=too-many-locals
             return redirect("/columnartodatabaseview/form")
 
         # Go back to welcome page / splash screen
-        message = __(
+        message = _(
             'Columnar file "%(columnar_filename)s" uploaded to table "%(table_name)s" '
             'in database "%(db_name)s"',
             columnar_filename=[file.filename for file in form.columnar_file.data],
diff --git a/superset/views/sql_lab/views.py b/superset/views/sql_lab/views.py
index 509ff4211aacc..99b57fe195bb5 100644
--- a/superset/views/sql_lab/views.py
+++ b/superset/views/sql_lab/views.py
@@ -145,7 +145,7 @@ def post(self) -> FlaskResponse:  # pylint: disable=no-self-use
             user_id=get_user_id(),
             # This is for backward compatibility
             label=query_editor.get("name")
-            or query_editor.get("title", "Untitled Query"),
+            or query_editor.get("title", _("Untitled Query")),
             active=True,
             database_id=query_editor["dbId"],
             schema=query_editor.get("schema"),
diff --git a/superset/viz.py b/superset/viz.py
index c4582925da120..1f4c795325b4b 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -3224,7 +3224,7 @@ def get_data(self, df: pd.DataFrame) -> VizData:
         groups = get_column_names(self.form_data.get("groupby"))
         time_op = self.form_data.get("time_series_option", "not_time")
         if not groups:
-            raise ValueError("Please choose at least one groupby")
+            raise ValueError(_("Please choose at least one groupby"))
         if time_op == "not_time":
             levels = self.levels_for("agg_sum", groups, df)
         elif time_op in ["agg_sum", "agg_mean"]:

From d9a29e719c28bfb7174e89f683d39021518bd141 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Wed, 18 Jan 2023 14:31:05 +0300
Subject: [PATCH 03/16] fix

---
 superset/initialization/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset/initialization/__init__.py b/superset/initialization/__init__.py
index f4df90796dcf3..12d6ffa47671a 100644
--- a/superset/initialization/__init__.py
+++ b/superset/initialization/__init__.py
@@ -409,7 +409,6 @@ def init_views(self) -> None:
             "Row Level Security",
             label=__("Row Level Security"),
             href="/rowlevelsecurity/list/",
-            label=__("Row Level Security"),
             category="Security",
             category_label=__("Security"),
             icon="fa-lock",

From 62010d917572c003986939cbaf33ba5f8b2728e7 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Wed, 18 Jan 2023 14:42:07 +0300
Subject: [PATCH 04/16] fix

---
 superset/errors.py              | 6 +-----
 superset/sqllab/query_render.py | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/superset/errors.py b/superset/errors.py
index 4d41bcfdc5889..b552f0ffdb762 100644
--- a/superset/errors.py
+++ b/superset/errors.py
@@ -220,11 +220,7 @@ def __post_init__(self) -> None:
                         {
                             "code": issue_code,
                             "message": (
-                                _(
-                                    "Issue %(issue_code)s - %(issue_msg)s",
-                                    issue_code=issue_code,
-                                    issue_msg=ISSUE_CODES[issue_code],
-                                )
+                                f"Issue {issue_code} - {ISSUE_CODES[issue_code]}"
                             ),
                         }
                         for issue_code in issue_codes
diff --git a/superset/sqllab/query_render.py b/superset/sqllab/query_render.py
index 2bf93350d1db5..df631784e35b1 100644
--- a/superset/sqllab/query_render.py
+++ b/superset/sqllab/query_render.py
@@ -29,9 +29,7 @@
 from superset.sqllab.exceptions import SqlLabException
 from superset.utils import core as utils
 
-MSG_OF_1006 = __(
-    "Issue 1006 - One or more parameters specified in the query are missing."
-)
+MSG_OF_1006 = "Issue 1006 - One or more parameters specified in the query are missing."
 
 if TYPE_CHECKING:
     from superset.jinja_context import BaseTemplateProcessor

From d116476a2b250f6da0760dbd5e521aed29ec45ce Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Wed, 18 Jan 2023 15:30:45 +0300
Subject: [PATCH 05/16] fix

---
 superset/charts/post_processing.py            |  2 +-
 .../unit_tests/charts/test_post_processing.py | 53 ++++++++++---------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/superset/charts/post_processing.py b/superset/charts/post_processing.py
index 4998c2927cca8..80aea12692f65 100644
--- a/superset/charts/post_processing.py
+++ b/superset/charts/post_processing.py
@@ -69,7 +69,7 @@ def pivot_df(  # pylint: disable=too-many-locals, too-many-arguments, too-many-s
     show_columns_total: bool = False,
     apply_metrics_on_rows: bool = False,
 ) -> pd.DataFrame:
-    metric_name = _("Total (%(aggfunc)s)", aggfunc=aggfunc)
+    metric_name = __("Total (%(aggfunc)s)", aggfunc=aggfunc)
 
     if transpose_pivot:
         rows, columns = columns, rows
diff --git a/tests/unit_tests/charts/test_post_processing.py b/tests/unit_tests/charts/test_post_processing.py
index cfab4e3d74b8c..7212870877f9c 100644
--- a/tests/unit_tests/charts/test_post_processing.py
+++ b/tests/unit_tests/charts/test_post_processing.py
@@ -18,6 +18,7 @@
 import json
 
 import pandas as pd
+from flask_babel import lazy_gettext as _
 from numpy import True_
 from pytest import raises
 from sqlalchemy.orm.session import Session
@@ -57,10 +58,10 @@ def test_pivot_df_no_cols_no_rows_single_metric():
     )
     assert (
         pivoted.to_markdown()
-        == """
+        == f"""
 |                  |   ('SUM(num)',) |
 |:-----------------|----------------:|
-| ('Total (Sum)',) |     8.06797e+07 |
+| ('{_("Total")} (Sum)',) |     8.06797e+07 |
     """.strip()
     )
 
@@ -79,10 +80,10 @@ def test_pivot_df_no_cols_no_rows_single_metric():
     )
     assert (
         pivoted.to_markdown()
-        == """
+        == f"""
 |                  |   ('SUM(num)',) |
 |:-----------------|----------------:|
-| ('Total (Sum)',) |     8.06797e+07 |
+| ('{_("Total")} (Sum)',) |     8.06797e+07 |
     """.strip()
     )
 
@@ -102,8 +103,8 @@ def test_pivot_df_no_cols_no_rows_single_metric():
     )
     assert (
         pivoted.to_markdown()
-        == """
-|               |   ('Total (Sum)',) |
+        == f"""
+|               |   ('{_("Total")} (Sum)',) |
 |:--------------|-------------------:|
 | ('SUM(num)',) |        8.06797e+07 |
     """.strip()
@@ -124,10 +125,10 @@ def test_pivot_df_no_cols_no_rows_single_metric():
     )
     assert (
         pivoted.to_markdown()
-        == """
+        == f"""
 |                  |   ('SUM(num)',) |   ('Total (Sum)',) |
 |:-----------------|----------------:|-------------------:|
-| ('Total (Sum)',) |     8.06797e+07 |        8.06797e+07 |
+| ('{_("Total")} (Sum)',) |     8.06797e+07 |        8.06797e+07 |
     """.strip()
     )
 
@@ -162,10 +163,10 @@ def test_pivot_df_no_cols_no_rows_two_metrics():
     )
     assert (
         pivoted.to_markdown()
-        == """
+        == f"""
 |                  |   ('SUM(num)',) |   ('MAX(num)',) |
 |:-----------------|----------------:|----------------:|
-| ('Total (Sum)',) |     8.06797e+07 |           37296 |
+| ('{_("Total")} (Sum)',) |     8.06797e+07 |           37296 |
     """.strip()
     )
 
@@ -207,8 +208,8 @@ def test_pivot_df_no_cols_no_rows_two_metrics():
     )
     assert (
         pivoted.to_markdown()
-        == """
-|               |   ('Total (Sum)',) |
+        == f"""
+|               |   ('{_("Total")} (Sum)',) |
 |:--------------|-------------------:|
 | ('SUM(num)',) |        8.06797e+07 |
 | ('MAX(num)',) |    37296           |
@@ -231,10 +232,10 @@ def test_pivot_df_no_cols_no_rows_two_metrics():
     )
     assert (
         pivoted.to_markdown()
-        == """
-|                  |   ('SUM(num)',) |   ('MAX(num)',) |   ('Total (Sum)',) |
+        == f"""
+|                  |   ('SUM(num)',) |   ('MAX(num)',) |   ('{_("Total")} (Sum)',) |
 |:-----------------|----------------:|----------------:|-------------------:|
-| ('Total (Sum)',) |     8.06797e+07 |           37296 |         8.0717e+07 |
+| ('{_("Total")} (Sum)',) |     8.06797e+07 |           37296 |         8.0717e+07 |
     """.strip()
     )
 
@@ -297,10 +298,10 @@ def test_pivot_df_single_row_two_metrics():
     )
     assert (
         pivoted.to_markdown()
-        == """
+        == f"""
 |                  |   ('SUM(num)', 'boy') |   ('SUM(num)', 'girl') |   ('MAX(num)', 'boy') |   ('MAX(num)', 'girl') |
 |:-----------------|----------------------:|-----------------------:|----------------------:|-----------------------:|
-| ('Total (Sum)',) |                 47123 |                 118065 |                  1280 |                   2588 |
+| ('{_("Total")} (Sum)',) |                 47123 |                 118065 |                  1280 |                   2588 |
     """.strip()
     )
 
@@ -342,12 +343,12 @@ def test_pivot_df_single_row_two_metrics():
     )
     assert (
         pivoted.to_markdown()
-        == """
-|                  |   ('SUM(num)',) |   ('MAX(num)',) |   ('Total (Sum)',) |
+        == f"""
+|                  |   ('SUM(num)',) |   ('MAX(num)',) |   ('{_("Total")} (Sum)',) |
 |:-----------------|----------------:|----------------:|-------------------:|
 | ('boy',)         |           47123 |            1280 |              48403 |
 | ('girl',)        |          118065 |            2588 |             120653 |
-| ('Total (Sum)',) |          165188 |            3868 |             169056 |
+| ('{_("Total")} (Sum)',) |          165188 |            3868 |             169056 |
     """.strip()
     )
 
@@ -366,8 +367,8 @@ def test_pivot_df_single_row_two_metrics():
     )
     assert (
         pivoted.to_markdown()
-        == """
-|                          |   ('Total (Sum)',) |
+        == f"""
+|                          |   ('{_("Total")} (Sum)',) |
 |:-------------------------|-------------------:|
 | ('SUM(num)', 'boy')      |              47123 |
 | ('SUM(num)', 'girl')     |             118065 |
@@ -375,7 +376,7 @@ def test_pivot_df_single_row_two_metrics():
 | ('MAX(num)', 'boy')      |               1280 |
 | ('MAX(num)', 'girl')     |               2588 |
 | ('MAX(num)', 'Subtotal') |               3868 |
-| ('Total (Sum)', '')      |             169056 |
+| ('{_("Total")} (Sum)', '')      |             169056 |
     """.strip()
     )
 
@@ -394,8 +395,8 @@ def test_pivot_df_single_row_two_metrics():
     )
     assert (
         pivoted.to_markdown()
-        == """
-|                      |   ('Total (Sum)',) |
+        == f"""
+|                      |   ('{_("Total")} (Sum)',) |
 |:---------------------|-------------------:|
 | ('boy', 'SUM(num)')  |              47123 |
 | ('boy', 'MAX(num)')  |               1280 |
@@ -403,7 +404,7 @@ def test_pivot_df_single_row_two_metrics():
 | ('girl', 'SUM(num)') |             118065 |
 | ('girl', 'MAX(num)') |               2588 |
 | ('girl', 'Subtotal') |             120653 |
-| ('Total (Sum)', '')  |             169056 |
+| ('{_("Total")} (Sum)', '')  |             169056 |
     """.strip()
     )
 

From 4aa21aae16c1e04b13b308f16c93fe8dce71466c Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Wed, 18 Jan 2023 15:47:31 +0300
Subject: [PATCH 06/16] fix

---
 superset/charts/post_processing.py |  2 +-
 superset/errors.py                 | 78 +++++++++++++++---------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/superset/charts/post_processing.py b/superset/charts/post_processing.py
index 80aea12692f65..acfe95f391f6c 100644
--- a/superset/charts/post_processing.py
+++ b/superset/charts/post_processing.py
@@ -30,7 +30,7 @@
 from typing import Any, Dict, List, Optional, Tuple, TYPE_CHECKING
 
 import pandas as pd
-from flask_babel import gettext as __, lazy_gettext as _
+from flask_babel import gettext as __
 
 from superset.common.chart_data import ChartDataResultFormat
 from superset.utils.core import (
diff --git a/superset/errors.py b/superset/errors.py
index b552f0ffdb762..2df0eb82b26e0 100644
--- a/superset/errors.py
+++ b/superset/errors.py
@@ -18,7 +18,7 @@
 from enum import Enum
 from typing import Any, Dict, Optional
 
-from flask_babel import gettext as __, lazy_gettext as _
+from flask_babel import lazy_gettext as _
 
 
 class SupersetErrorType(str, Enum):
@@ -95,54 +95,54 @@ class SupersetErrorType(str, Enum):
 
 
 ISSUE_CODES = {
-    1000: __("The datasource is too large to query."),
-    1001: __("The database is under an unusual load."),
-    1002: __("The database returned an unexpected error."),
-    1003: __(
+    1000: _("The datasource is too large to query."),
+    1001: _("The database is under an unusual load."),
+    1002: _("The database returned an unexpected error."),
+    1003: _(
         "There is a syntax error in the SQL query. "
         "Perhaps there was a misspelling or a typo."
     ),
-    1004: __("The column was deleted or renamed in the database."),
-    1005: __("The table was deleted or renamed in the database."),
-    1006: __("One or more parameters specified in the query are missing."),
-    1007: __("The hostname provided can't be resolved."),
-    1008: __("The port is closed."),
-    1009: __("The host might be down, and can't be reached on the provided port."),
-    1010: __("Superset encountered an error while running a command."),
-    1011: __("Superset encountered an unexpected error."),
-    1012: __("The username provided when connecting to a database is not valid."),
-    1013: __("The password provided when connecting to a database is not valid."),
-    1014: __("Either the username or the password is wrong."),
-    1015: __("Either the database is spelled incorrectly or does not exist."),
-    1016: __("The schema was deleted or renamed in the database."),
-    1017: __("User doesn't have the proper permissions."),
-    1018: __("One or more parameters needed to configure a database are missing."),
-    1019: __("The submitted payload has the incorrect format."),
-    1020: __("The submitted payload has the incorrect schema."),
-    1021: __("Results backend needed for asynchronous queries is not configured."),
-    1022: __("Database does not allow data manipulation."),
-    1023: __(
+    1004: _("The column was deleted or renamed in the database."),
+    1005: _("The table was deleted or renamed in the database."),
+    1006: _("One or more parameters specified in the query are missing."),
+    1007: _("The hostname provided can't be resolved."),
+    1008: _("The port is closed."),
+    1009: _("The host might be down, and can't be reached on the provided port."),
+    1010: _("Superset encountered an error while running a command."),
+    1011: _("Superset encountered an unexpected error."),
+    1012: _("The username provided when connecting to a database is not valid."),
+    1013: _("The password provided when connecting to a database is not valid."),
+    1014: _("Either the username or the password is wrong."),
+    1015: _("Either the database is spelled incorrectly or does not exist."),
+    1016: _("The schema was deleted or renamed in the database."),
+    1017: _("User doesn't have the proper permissions."),
+    1018: _("One or more parameters needed to configure a database are missing."),
+    1019: _("The submitted payload has the incorrect format."),
+    1020: _("The submitted payload has the incorrect schema."),
+    1021: _("Results backend needed for asynchronous queries is not configured."),
+    1022: _("Database does not allow data manipulation."),
+    1023: _(
         "The CTAS (create table as select) doesn't have a "
         "SELECT statement at the end. Please make sure your query has a "
         "SELECT as its last statement. Then, try running your query again."
     ),
-    1024: __("CVAS (create view as select) query has more than one statement."),
-    1025: __("CVAS (create view as select) query is not a SELECT statement."),
-    1026: __("Query is too complex and takes too long to run."),
-    1027: __("The database is currently running too many queries."),
-    1028: __("One or more parameters specified in the query are malformatted."),
-    1029: __("The object does not exist in the given database."),
-    1030: __("The query has a syntax error."),
-    1031: __("The results backend no longer has the data from the query."),
-    1032: __("The query associated with the results was deleted."),
-    1033: __(
+    1024: _("CVAS (create view as select) query has more than one statement."),
+    1025: _("CVAS (create view as select) query is not a SELECT statement."),
+    1026: _("Query is too complex and takes too long to run."),
+    1027: _("The database is currently running too many queries."),
+    1028: _("One or more parameters specified in the query are malformatted."),
+    1029: _("The object does not exist in the given database."),
+    1030: _("The query has a syntax error."),
+    1031: _("The results backend no longer has the data from the query."),
+    1032: _("The query associated with the results was deleted."),
+    1033: _(
         "The results stored in the backend were stored in a "
         "different format, and no longer can be deserialized."
     ),
-    1034: __("The port number is invalid."),
-    1035: __("Failed to start remote query on a worker."),
-    1036: __("The database was deleted."),
-    1037: __("Custom SQL fields cannot contain sub-queries."),
+    1034: _("The port number is invalid."),
+    1035: _("Failed to start remote query on a worker."),
+    1036: _("The database was deleted."),
+    1037: _("Custom SQL fields cannot contain sub-queries."),
 }
 
 

From 51c9dbe862e94db14309577018cecca227528e4c Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Wed, 18 Jan 2023 16:17:53 +0300
Subject: [PATCH 07/16] fix

---
 superset/commands/importers/v1/__init__.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/superset/commands/importers/v1/__init__.py b/superset/commands/importers/v1/__init__.py
index 2d5660abb5b6d..f581b5c2d0613 100644
--- a/superset/commands/importers/v1/__init__.py
+++ b/superset/commands/importers/v1/__init__.py
@@ -91,9 +91,7 @@ def validate(self) -> None:
         self._prevent_overwrite_existing_model(exceptions)
 
         if exceptions:
-            exception = CommandInvalidError(
-                _("Error importing %(model_name)s.", model_name=self.model_name)
-            )
+            exception = CommandInvalidError(f"Error importing {self.model_name}")
             exception.add_list(exceptions)
             raise exception
 
@@ -111,11 +109,10 @@ def _prevent_overwrite_existing_model(  # pylint: disable=invalid-name
                     exceptions.append(
                         ValidationError(
                             {
-                                file_name: _(
-                                    "%(model_name)s already exists "
-                                    "and `overwrite=true` was not passed",
-                                    model_name=self.model_name.title(),
-                                )
+                                file_name: (
+                                    f"{self.model_name.title()} already exists "
+                                    "and `overwrite=true` was not passed"
+                                ),
                             }
                         )
                     )

From f9c425f0f9e11b4944fc101f47ad50cfad0b88e2 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Wed, 18 Jan 2023 16:49:23 +0300
Subject: [PATCH 08/16] fix + localization

---
 .../superset-ui-core/src/time-format/formatters/smartDate.ts  | 3 +--
 .../src/time-format/formatters/smartDateDetailed.ts           | 3 +--
 .../src/time-format/formatters/smartDateVerbose.ts            | 3 +--
 superset-frontend/src/constants.ts                            | 4 +++-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDate.ts b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDate.ts
index 92fb99c9c24f7..0aafb2a893cc2 100644
--- a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDate.ts
+++ b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDate.ts
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-import { t } from '@superset-ui/core';
 import createMultiFormatter from '../factories/createMultiFormatter';
 
 const smartDateFormatter = createMultiFormatter({
   id: 'smart_date',
-  label: t('Adaptative Formatting'),
+  label: 'Adaptative Formatting',
   formats: {
     millisecond: '.%Lms',
     second: ':%Ss',
diff --git a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateDetailed.ts b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateDetailed.ts
index 1d2ddd8f92b05..d8a30e9a1c039 100644
--- a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateDetailed.ts
+++ b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateDetailed.ts
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-import { t } from '@superset-ui/core';
 import createMultiFormatter from '../factories/createMultiFormatter';
 
 const smartDateDetailedFormatter = createMultiFormatter({
   id: 'smart_date_detailed',
-  label: t('Detailed adaptive formatter'),
+  label: 'Detailed adaptive formatter',
   formats: {
     millisecond: '%Y-%m-%d %H:%M:%S.%L',
     second: '%Y-%m-%d %H:%M:%S',
diff --git a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateVerbose.ts b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateVerbose.ts
index c309060617ca0..4178322864bce 100644
--- a/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateVerbose.ts
+++ b/superset-frontend/packages/superset-ui-core/src/time-format/formatters/smartDateVerbose.ts
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-import { t } from '@superset-ui/core';
 import createMultiFormatter from '../factories/createMultiFormatter';
 
 const smartDateFormatter = createMultiFormatter({
   id: 'smart_date_verbose',
-  label: t('Verbose Adaptative Formatting'),
+  label: 'Verbose Adaptative Formatting',
   formats: {
     millisecond: '.%L',
     second: '%a %b %d, %I:%M:%S %p',
diff --git a/superset-frontend/src/constants.ts b/superset-frontend/src/constants.ts
index dcef70da7e8a5..66f2f70aa795a 100644
--- a/superset-frontend/src/constants.ts
+++ b/superset-frontend/src/constants.ts
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { t } from '@superset-ui/core';
+
 import { BootstrapData, CommonBootstrapData } from './types/bootstrapTypes';
 
 export const DATETIME_WITH_TIME_ZONE = 'YYYY-MM-DD HH:mm:ssZ';
@@ -142,7 +144,7 @@ export const SLOW_DEBOUNCE = 500;
 /**
  * Display null as `N/A`
  */
-export const NULL_DISPLAY = 'N/A';
+export const NULL_DISPLAY = t('N/A');
 
 export const DEFAULT_COMMON_BOOTSTRAP_DATA: CommonBootstrapData = {
   flash_messages: [],

From c5074cb2cded3e6040623db74e74712fc62a83c5 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Thu, 19 Jan 2023 10:29:18 +0300
Subject: [PATCH 09/16] localization

---
 .../src/vendor/cal-heatmap.js                 |  8 +++---
 .../Timeseries/Regular/Bar/controlPanel.tsx   | 28 +++++++++----------
 .../plugin-chart-table/src/TableChart.tsx     |  2 +-
 .../Datasource/DatasourceEditor.jsx           | 12 ++++----
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.js b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.js
index 3320693f5cc63..760bf0ce2b0c4 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/vendor/cal-heatmap.js
@@ -9,7 +9,7 @@
 /* eslint-disable */
 
 import d3tip from 'd3-tip';
-import { getContrastingColor } from '@superset-ui/core';
+import { getContrastingColor, t } from '@superset-ui/core';
 
 var d3 = typeof require === 'function' ? require('d3') : window.d3;
 
@@ -256,9 +256,9 @@ var CalHeatMap = function () {
 
     // Formatting of the title displayed when hovering a legend cell
     legendTitleFormat: {
-      lower: 'less than {min} {name}',
-      inner: 'between {down} and {up} {name}',
-      upper: 'more than {max} {name}',
+      lower: t('less than {min} {name}'),
+      inner: t('between {down} and {up} {name}'),
+      upper: t('more than {max} {name}'),
     },
 
     // Animation duration, in ms
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
index 3e1bb68f49d0f..ae0dd2409c1fb 100644
--- a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
+++ b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/Regular/Bar/controlPanel.tsx
@@ -52,7 +52,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
   const isXAxis = axis === 'x';
   const isVertical = (controls: ControlStateMapping) =>
     Boolean(controls?.orientation.value === OrientationType.vertical);
-  const isHorizental = (controls: ControlStateMapping) =>
+  const isHorizontal = (controls: ControlStateMapping) =>
     Boolean(controls?.orientation.value === OrientationType.horizontal);
   return [
     [
@@ -65,7 +65,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           default: '',
           description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isVertical(controls) : isHorizental(controls),
+            isXAxis ? isVertical(controls) : isHorizontal(controls),
         },
       },
     ],
@@ -82,7 +82,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
           description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isVertical(controls) : isHorizental(controls),
+            isXAxis ? isVertical(controls) : isHorizontal(controls),
         },
       },
     ],
@@ -96,7 +96,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           default: '',
           description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isHorizental(controls) : isVertical(controls),
+            isXAxis ? isHorizontal(controls) : isVertical(controls),
         },
       },
     ],
@@ -113,7 +113,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           choices: formatSelectOptions(sections.TITLE_MARGIN_OPTIONS),
           description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isHorizental(controls) : isVertical(controls),
+            isXAxis ? isHorizontal(controls) : isVertical(controls),
         },
       },
     ],
@@ -130,7 +130,7 @@ function createAxisTitleControl(axis: 'x' | 'y'): ControlSetRow[] {
           choices: sections.TITLE_POSITION_OPTIONS,
           description: t('Changing this control takes effect instantly'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isHorizental(controls) : isVertical(controls),
+            isXAxis ? isHorizontal(controls) : isVertical(controls),
         },
       },
     ],
@@ -141,7 +141,7 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
   const isXAxis = axis === 'x';
   const isVertical = (controls: ControlStateMapping) =>
     Boolean(controls?.orientation.value === OrientationType.vertical);
-  const isHorizental = (controls: ControlStateMapping) =>
+  const isHorizontal = (controls: ControlStateMapping) =>
     Boolean(controls?.orientation.value === OrientationType.horizontal);
   return [
     [
@@ -154,7 +154,7 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
             'When using other than adaptive formatting, labels may overlap.',
           )}`,
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isVertical(controls) : isHorizental(controls),
+            isXAxis ? isVertical(controls) : isHorizontal(controls),
         },
       },
     ],
@@ -176,7 +176,7 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
             'Input field supports custom rotation. e.g. 30 for 30°',
           ),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isVertical(controls) : isHorizental(controls),
+            isXAxis ? isVertical(controls) : isHorizontal(controls),
         },
       },
     ],
@@ -187,7 +187,7 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
           ...sharedControls.y_axis_format,
           label: t('Axis Format'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isHorizental(controls) : isVertical(controls),
+            isXAxis ? isHorizontal(controls) : isVertical(controls),
         },
       },
     ],
@@ -201,7 +201,7 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
           default: logAxis,
           description: t('Logarithmic axis'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isHorizental(controls) : isVertical(controls),
+            isXAxis ? isHorizontal(controls) : isVertical(controls),
         },
       },
     ],
@@ -215,7 +215,7 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
           default: minorSplitLine,
           description: t('Draw split lines for minor axis ticks'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isHorizental(controls) : isVertical(controls),
+            isXAxis ? isHorizontal(controls) : isVertical(controls),
         },
       },
     ],
@@ -229,7 +229,7 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
           renderTrigger: true,
           description: t('It’s not recommended to truncate axis in Bar chart.'),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
-            isXAxis ? isHorizental(controls) : isVertical(controls),
+            isXAxis ? isHorizontal(controls) : isVertical(controls),
         },
       },
     ],
@@ -249,7 +249,7 @@ function createAxisControl(axis: 'x' | 'y'): ControlSetRow[] {
           ),
           visibility: ({ controls }: ControlPanelsContainerProps) =>
             Boolean(controls?.truncateYAxis?.value) &&
-            (isXAxis ? isHorizental(controls) : isVertical(controls)),
+            (isXAxis ? isHorizontal(controls) : isVertical(controls)),
         },
       },
     ],
diff --git a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
index af490395f369e..26019a972735a 100644
--- a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
+++ b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
@@ -198,7 +198,7 @@ function SelectPageSize({
 }
 
 const getNoResultsMessage = (filter: string) =>
-  t(filter ? 'No matching records found' : 'No records found');
+  filter ? t('No matching records found') : t('No records found');
 
 export default function TableChart<D extends DataRecord = DataRecord>(
   props: TableChartTransformedProps<D> & {
diff --git a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
index 4a484f12569b6..6f0f8a84862b1 100644
--- a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
+++ b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
@@ -491,7 +491,7 @@ ColumnCollectionTable.defaultProps = {
   allowAddItem: false,
   allowEditDataType: false,
   itemGenerator: () => ({
-    column_name: '<new column>',
+    column_name: t('<new column>'),
     filterable: true,
     groupby: true,
   }),
@@ -976,8 +976,8 @@ class DatasourceEditor extends React.PureComponent {
           tableColumns={['name', 'config']}
           onChange={this.onDatasourcePropChange.bind(this, 'spatials')}
           itemGenerator={() => ({
-            name: '<new spatial>',
-            type: '<no type>',
+            name: t('<new spatial>'),
+            type: t('<no type>'),
             config: null,
           })}
           collection={spatials}
@@ -1256,7 +1256,7 @@ class DatasourceEditor extends React.PureComponent {
         allowAddItem
         onChange={this.onDatasourcePropChange.bind(this, 'metrics')}
         itemGenerator={() => ({
-          metric_name: '<new metric>',
+          metric_name: t('<new metric>'),
           verbose_name: '',
           expression: '',
         })}
@@ -1418,10 +1418,10 @@ class DatasourceEditor extends React.PureComponent {
                 allowAddItem
                 allowEditDataType
                 itemGenerator={() => ({
-                  column_name: '<new column>',
+                  column_name: t('<new column>'),
                   filterable: true,
                   groupby: true,
-                  expression: '<enter SQL expression here>',
+                  expression: t('<enter SQL expression here>'),
                   __expanded: true,
                 })}
               />

From abf9e9ec84018ab32973e5b651e026aa8d0f99d6 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Thu, 19 Jan 2023 12:15:20 +0300
Subject: [PATCH 10/16] fix + localization

---
 superset-frontend/src/components/Select/Select.tsx          | 2 +-
 superset-frontend/src/profile/components/RecentActivity.tsx | 2 ++
 superset/annotation_layers/annotations/schemas.py           | 3 +--
 superset/dashboards/schemas.py                              | 4 ++--
 superset/reports/dao.py                                     | 2 +-
 superset/utils/schema.py                                    | 3 +--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/superset-frontend/src/components/Select/Select.tsx b/superset-frontend/src/components/Select/Select.tsx
index d96b3ff231108..5550463492231 100644
--- a/superset-frontend/src/components/Select/Select.tsx
+++ b/superset-frontend/src/components/Select/Select.tsx
@@ -85,7 +85,7 @@ const Select = forwardRef(
       loading,
       mode = 'single',
       name,
-      notFoundContent = t('No data'),
+      notFoundContent,
       onChange,
       onClear,
       onDropdownVisibleChange,
diff --git a/superset-frontend/src/profile/components/RecentActivity.tsx b/superset-frontend/src/profile/components/RecentActivity.tsx
index 4c1e81cb7cdbb..29518e7d80aa6 100644
--- a/superset-frontend/src/profile/components/RecentActivity.tsx
+++ b/superset-frontend/src/profile/components/RecentActivity.tsx
@@ -18,6 +18,7 @@
  */
 import React from 'react';
 import moment from 'moment';
+import { t } from '@superset-ui/core';
 
 import TableLoader from '../../components/TableLoader';
 import { Activity } from '../types';
@@ -46,6 +47,7 @@ export default function RecentActivity({ user }: RecentActivityProps) {
         mutator={mutator}
         sortable
         dataEndpoint={`/superset/recent_activity/${user?.userId}/?limit=${rowLimit}`}
+        noDataText={t('No Data')}
       />
     </div>
   );
diff --git a/superset/annotation_layers/annotations/schemas.py b/superset/annotation_layers/annotations/schemas.py
index 384872d8dcf3e..5e0bac56f73e0 100644
--- a/superset/annotation_layers/annotations/schemas.py
+++ b/superset/annotation_layers/annotations/schemas.py
@@ -16,7 +16,6 @@
 # under the License.
 from typing import Union
 
-from flask_babel import lazy_gettext as _
 from marshmallow import fields, Schema, ValidationError
 from marshmallow.validate import Length
 
@@ -53,7 +52,7 @@ def validate_json(value: Union[bytes, bytearray, str]) -> None:
     try:
         utils.validate_json(value)
     except SupersetException as ex:
-        raise ValidationError(_("JSON not valid")) from ex
+        raise ValidationError("JSON not valid") from ex
 
 
 class AnnotationPostSchema(Schema):
diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py
index 7b6e7a1f0f1d1..490f7890583a1 100644
--- a/superset/dashboards/schemas.py
+++ b/superset/dashboards/schemas.py
@@ -93,7 +93,7 @@ def validate_json(value: Union[bytes, bytearray, str]) -> None:
     try:
         utils.validate_json(value)
     except SupersetException as ex:
-        raise ValidationError(_("JSON not valid")) from ex
+        raise ValidationError("JSON not valid") from ex
 
 
 def validate_json_metadata(value: Union[bytes, bytearray, str]) -> None:
@@ -102,7 +102,7 @@ def validate_json_metadata(value: Union[bytes, bytearray, str]) -> None:
     try:
         value_obj = json.loads(value)
     except json.decoder.JSONDecodeError as ex:
-        raise ValidationError(_("JSON not valid")) from ex
+        raise ValidationError("JSON not valid") from ex
     errors = DashboardJSONMetadataSchema().validate(value_obj, partial=False)
     if errors:
         raise ValidationError(errors)
diff --git a/superset/reports/dao.py b/superset/reports/dao.py
index 22bf5c4b48b12..ed1e1f66c02aa 100644
--- a/superset/reports/dao.py
+++ b/superset/reports/dao.py
@@ -40,7 +40,7 @@
 logger = logging.getLogger(__name__)
 
 
-REPORT_SCHEDULE_ERROR_NOTIFICATION_MARKER = _("Notification sent with error")
+REPORT_SCHEDULE_ERROR_NOTIFICATION_MARKER = "Notification sent with error"
 
 
 class ReportScheduleDAO(BaseDAO):
diff --git a/superset/utils/schema.py b/superset/utils/schema.py
index 819269d619914..c082ae017c211 100644
--- a/superset/utils/schema.py
+++ b/superset/utils/schema.py
@@ -16,7 +16,6 @@
 # under the License.
 from typing import Any, Union
 
-from flask_babel import lazy_gettext as _
 from marshmallow import validate, ValidationError
 
 from superset.exceptions import SupersetException
@@ -52,4 +51,4 @@ def validate_json(value: Union[bytes, bytearray, str]) -> None:
     try:
         utils.validate_json(value)
     except SupersetException as ex:
-        raise ValidationError(_("JSON not valid")) from ex
+        raise ValidationError("JSON not valid") from ex

From d04c763b8391e58a936b62360252b32297dfdda5 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Thu, 19 Jan 2023 14:15:02 +0300
Subject: [PATCH 11/16] fix

---
 .../src/dashboard/stylesheets/components/column.less             | 1 -
 superset-frontend/src/dashboard/stylesheets/components/row.less  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/superset-frontend/src/dashboard/stylesheets/components/column.less b/superset-frontend/src/dashboard/stylesheets/components/column.less
index 6a0c15b579012..7d7b7baba3646 100644
--- a/superset-frontend/src/dashboard/stylesheets/components/column.less
+++ b/superset-frontend/src/dashboard/stylesheets/components/column.less
@@ -49,7 +49,6 @@
 .grid-column--empty {
   min-height: 100px;
 
-  // TODO: localize content
   &:before {
     content: 'Empty column';
     position: absolute;
diff --git a/superset-frontend/src/dashboard/stylesheets/components/row.less b/superset-frontend/src/dashboard/stylesheets/components/row.less
index a4516dc39b10d..ec096d0bfa949 100644
--- a/superset-frontend/src/dashboard/stylesheets/components/row.less
+++ b/superset-frontend/src/dashboard/stylesheets/components/row.less
@@ -77,7 +77,6 @@
   align-items: center;
   height: 100px;
 
-  // TODO: localize content
   &:before {
     position: absolute;
     top: 0;

From 71c655f56fbae4e89d722588138888808d1fbd6a Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Thu, 19 Jan 2023 14:25:49 +0300
Subject: [PATCH 12/16] fix

---
 .../src/dashboard/components/menu/BackgroundStyleDropdown.tsx  | 3 +--
 superset/dashboards/schemas.py                                 | 1 -
 superset/reports/dao.py                                        | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
index 834e3cd12c368..bc73d8b565ae1 100644
--- a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
+++ b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
@@ -17,9 +17,8 @@
  * under the License.
  */
 import React from 'react';
-import { t } from '@superset-ui/core';
 import cx from 'classnames';
-import { css, styled } from '@superset-ui/core';
+import { css, styled, t } from '@superset-ui/core';
 
 import backgroundStyleOptions from 'src/dashboard/util/backgroundStyleOptions';
 import PopoverDropdown, {
diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py
index 490f7890583a1..d3a9444980966 100644
--- a/superset/dashboards/schemas.py
+++ b/superset/dashboards/schemas.py
@@ -18,7 +18,6 @@
 import re
 from typing import Any, Dict, Union
 
-from flask_babel import lazy_gettext as _
 from marshmallow import fields, post_load, Schema
 from marshmallow.validate import Length, ValidationError
 
diff --git a/superset/reports/dao.py b/superset/reports/dao.py
index ed1e1f66c02aa..be5ee8053c48b 100644
--- a/superset/reports/dao.py
+++ b/superset/reports/dao.py
@@ -20,7 +20,6 @@
 from typing import Any, Dict, List, Optional
 
 from flask_appbuilder import Model
-from flask_babel import lazy_gettext as _
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 

From 10e4c70ebec955397f8780e1feac0dc1bcc9e609 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Thu, 19 Jan 2023 15:17:32 +0300
Subject: [PATCH 13/16] fix

---
 superset/commands/importers/v1/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset/commands/importers/v1/__init__.py b/superset/commands/importers/v1/__init__.py
index f581b5c2d0613..c620ec9f2ac85 100644
--- a/superset/commands/importers/v1/__init__.py
+++ b/superset/commands/importers/v1/__init__.py
@@ -16,7 +16,6 @@
 # under the License.
 from typing import Any, Dict, List, Optional, Set
 
-from flask_babel import lazy_gettext as _
 from marshmallow import Schema, validate
 from marshmallow.exceptions import ValidationError
 from sqlalchemy.orm import Session

From c898474359446114160c51f3dfa1d078a9fe2413 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Thu, 19 Jan 2023 17:20:25 +0300
Subject: [PATCH 14/16] localization

---
 .../components/QueryStateLabel/index.tsx      |  7 ++-----
 .../src/SqlLab/components/SouthPane/index.tsx |  6 ++----
 superset-frontend/src/SqlLab/constants.ts     | 20 +++++++++++++++++++
 .../src/views/CRUD/alert/AlertReportModal.tsx |  4 +---
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx b/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx
index cc35198e023f4..0ae092ef5efe3 100644
--- a/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx
+++ b/superset-frontend/src/SqlLab/components/QueryStateLabel/index.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import Label from 'src/components/Label';
-import { STATE_TYPE_MAP } from 'src/SqlLab/constants';
+import { STATE_TYPE_MAP, STATE_TYPE_MAP_LOCALIZED } from 'src/SqlLab/constants';
 import { styled, Query } from '@superset-ui/core';
 
 interface QueryStateLabelProps {
@@ -32,10 +32,7 @@ const StyledLabel = styled(Label)`
 export default function QueryStateLabel({ query }: QueryStateLabelProps) {
   return (
     <StyledLabel type={STATE_TYPE_MAP[query.state]}>
-      {
-        // TODO: localize STATE_TYPE_MAP
-        query.state
-      }
+      {STATE_TYPE_MAP_LOCALIZED[query.state]}
     </StyledLabel>
   );
 }
diff --git a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
index 7989e77af63af..0b389dfb39838 100644
--- a/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SouthPane/index.tsx
@@ -35,6 +35,7 @@ import {
   STATUS_OPTIONS,
   STATE_TYPE_MAP,
   LOCALSTORAGE_MAX_QUERY_AGE_MS,
+  STATUS_OPTIONS_LOCALIZED,
 } from '../../constants';
 
 const TAB_HEIGHT = 140;
@@ -145,10 +146,7 @@ const SouthPane = ({
   };
   const renderOfflineStatus = () => (
     <Label className="m-r-3" type={STATE_TYPE_MAP[STATUS_OPTIONS.offline]}>
-      {
-        // TODO: localize STATUS_OPTIONS
-        STATUS_OPTIONS.offline
-      }
+      {STATUS_OPTIONS_LOCALIZED.offline}
     </Label>
   );
 
diff --git a/superset-frontend/src/SqlLab/constants.ts b/superset-frontend/src/SqlLab/constants.ts
index 29b0f6cf6be0b..108ce895618a0 100644
--- a/superset-frontend/src/SqlLab/constants.ts
+++ b/superset-frontend/src/SqlLab/constants.ts
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { t } from '@superset-ui/core';
+
 export const STATE_TYPE_MAP = {
   offline: 'danger',
   failed: 'danger',
@@ -26,6 +28,16 @@ export const STATE_TYPE_MAP = {
   success: 'success',
 };
 
+export const STATE_TYPE_MAP_LOCALIZED = {
+  offline: t('offline'),
+  failed: t('failed'),
+  pending: t('pending'),
+  fetching: t('fetching'),
+  running: t('running'),
+  stopped: t('stopped'),
+  success: t('success'),
+};
+
 export const STATUS_OPTIONS = {
   success: 'success',
   failed: 'failed',
@@ -34,6 +46,14 @@ export const STATUS_OPTIONS = {
   pending: 'pending',
 };
 
+export const STATUS_OPTIONS_LOCALIZED = {
+  success: t('success'),
+  failed: t('failed'),
+  running: t('running'),
+  offline: t('offline'),
+  pending: t('pending'),
+};
+
 export const TIME_OPTIONS = [
   'now',
   '1 hour ago',
diff --git a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx
index f5bea2038515e..d7f7a4c7364c3 100644
--- a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx
+++ b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx
@@ -571,7 +571,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     const shouldEnableForceScreenshot = contentType === 'chart' && !isReport;
     const data: any = {
       ...currentAlert,
-      type: isReport ? 'Report' : 'Alert',
+      type: isReport ? t('Report') : t('Alert'),
       force_screenshot: shouldEnableForceScreenshot || forceScreenshot,
       validator_type: conditionNotNull ? 'not null' : 'operator',
       validator_config_json: conditionNotNull
@@ -614,7 +614,6 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
             return;
           }
 
-          // TODO: localize data.type
           addSuccessToast(t('%s updated', data.type));
 
           if (onAdd) {
@@ -631,7 +630,6 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
           return;
         }
 
-        // TODO: localize data.type
         addSuccessToast(t('%s updated', data.type));
 
         if (onAdd) {

From b15316ef7d6d4606cbe5749802c7473fc4d18b61 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Thu, 26 Jan 2023 12:38:57 +0300
Subject: [PATCH 15/16] enhance localization

---
 .../plugins/legacy-plugin-chart-calendar/src/Calendar.js   | 5 +++--
 .../plugins/legacy-plugin-chart-sunburst/src/Sunburst.js   | 5 +++--
 superset-frontend/src/SqlLab/actions/sqlLab.js             | 4 ++--
 .../dashboard/components/menu/BackgroundStyleDropdown.tsx  | 6 ++----
 .../src/utils/getChartRequiredFieldsMissingMessage.ts      | 7 +++----
 superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx    | 7 +++++--
 .../DatabaseConnectionForm/ValidatedInputField.tsx         | 2 +-
 superset-frontend/src/views/CRUD/hooks.ts                  | 4 ++--
 superset/connectors/base/models.py                         | 4 ++--
 superset/models/sql_lab.py                                 | 4 ++--
 10 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js
index f120f3fa98b0b..d97557a77b506 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-calendar/src/Calendar.js
@@ -85,11 +85,12 @@ function Calendar(element, props) {
 
   const metricsData = data.data;
 
+  const METRIC_TEXT = t('Metric');
+
   Object.keys(metricsData).forEach(metric => {
     const calContainer = div.append('div');
     if (showMetricName) {
-      // eslint-disable-next-line prefer-template
-      calContainer.text(t('Metric') + `: ${verboseMap[metric] || metric}`);
+      calContainer.text(`${METRIC_TEXT}: ${verboseMap[metric] || metric}`);
     }
     const timestamps = metricsData[metric];
     const extents = d3Extent(Object.keys(timestamps), key => timestamps[key]);
diff --git a/superset-frontend/plugins/legacy-plugin-chart-sunburst/src/Sunburst.js b/superset-frontend/plugins/legacy-plugin-chart-sunburst/src/Sunburst.js
index 338753b678c8b..dd70afad3b36c 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-sunburst/src/Sunburst.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-sunburst/src/Sunburst.js
@@ -385,14 +385,15 @@ function Sunburst(element, props) {
       // eslint-disable-next-line prefer-template
       .text(absolutePercString + ' ' + t('of total'));
 
+    const OF_PARENT_TEXT = t('of parent');
+
     if (conditionalPercString) {
       offsetIndex += 1;
       gMiddleText
         .append('text')
         .attr('class', 'path-cond-percent')
         .attr('y', yOffsets[offsetIndex])
-        // eslint-disable-next-line prefer-template
-        .text(conditionalPercString + ' ' + t('of parent'));
+        .text(`${conditionalPercString} ${OF_PARENT_TEXT}`);
     }
 
     offsetIndex += 1;
diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js
index 57e052d5000ae..c07ebfe683b5b 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.js
@@ -1412,6 +1412,7 @@ export function popQuery(queryId) {
 }
 export function popDatasourceQuery(datasourceKey, sql) {
   return function (dispatch) {
+    const QUERY_TEXT = t('Query');
     const datasetId = datasourceKey.split('__')[0];
     return SupersetClient.get({
       endpoint: `/api/v1/dataset/${datasetId}?q=(keys:!(none))`,
@@ -1419,8 +1420,7 @@ export function popDatasourceQuery(datasourceKey, sql) {
       .then(({ json }) =>
         dispatch(
           addQueryEditor({
-            // eslint-disable-next-line prefer-template
-            title: t('Query') + ` ${json.result.name}`,
+            title: `${QUERY_TEXT} ${json.result.name}`,
             dbId: json.result.database.id,
             schema: json.result.schema,
             autorun: sql !== undefined,
diff --git a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
index bc73d8b565ae1..5498b72169da4 100644
--- a/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
+++ b/superset-frontend/src/dashboard/components/menu/BackgroundStyleDropdown.tsx
@@ -73,14 +73,12 @@ const BackgroundStyleOption = styled.div`
 `;
 
 function renderButton(option: OptionProps) {
+  const BACKGROUND_TEXT = t('background');
   return (
     <BackgroundStyleOption
       className={cx('background-style-option', option.className)}
     >
-      {
-        // eslint-disable-next-line prefer-template
-        `${option.label} ` + t('background')
-      }
+      {`${option.label} ${BACKGROUND_TEXT}`}
     </BackgroundStyleOption>
   );
 }
diff --git a/superset-frontend/src/utils/getChartRequiredFieldsMissingMessage.ts b/superset-frontend/src/utils/getChartRequiredFieldsMissingMessage.ts
index 746cf0936d53f..865452ade8251 100644
--- a/superset-frontend/src/utils/getChartRequiredFieldsMissingMessage.ts
+++ b/superset-frontend/src/utils/getChartRequiredFieldsMissingMessage.ts
@@ -19,12 +19,11 @@
 
 import { t } from '@superset-ui/core';
 
-const CREATE_CHART = t('Create chart');
-const UPDATE_CHART = t('Update chart');
+const CREATE_CHART_TEXT = t('Create chart');
+const UPDATE_CHART_TEXT = t('Update chart');
 
 export const getChartRequiredFieldsMissingMessage = (isCreating: boolean) =>
   t(
     'Select values in highlighted field(s) in the control panel. Then run the query by clicking on the %s button.',
-    // eslint-disable-next-line prefer-template
-    isCreating ? '"' + CREATE_CHART + '"' : '"' + UPDATE_CHART + '"',
+    `"${isCreating ? CREATE_CHART_TEXT : UPDATE_CHART_TEXT}"`,
   );
diff --git a/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx b/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx
index 060439eb4b0e7..61b801c1c091a 100644
--- a/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx
+++ b/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx
@@ -159,6 +159,9 @@ function ExecutionLog({ addDangerToast, isReportEnabled }: ExecutionLogProps) {
     [isReportEnabled],
   );
   const path = `/${isReportEnabled ? 'report' : 'alert'}/list/`;
+  const ALERT_TEXT = t('Alert');
+  const REPORT_TEXT = t('Report');
+
   return (
     <>
       <SubMenu
@@ -167,9 +170,9 @@ function ExecutionLog({ addDangerToast, isReportEnabled }: ExecutionLogProps) {
             <span>
               {alertResource
                 ? alertResource.type === 'Alert'
-                  ? t('Alert:')
+                  ? `${ALERT_TEXT}:`
                   : alertResource.type === 'Report'
-                  ? t('Report:')
+                  ? `${REPORT_TEXT}:`
                   : null
                 : null}{' '}
               {alertResource?.name}
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx
index 76e1889fb9944..a00b3ba9354e9 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/DatabaseConnectionForm/ValidatedInputField.tsx
@@ -29,7 +29,7 @@ const FIELD_TEXT_MAP = {
     placeholder: t('e.g. world_population'),
   },
   warehouse: {
-    placeholder: t('e.g. world_population'),
+    placeholder: t('e.g. compute_wh'),
     className: 'form-group-w-50',
   },
   role: {
diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts
index de99cba6f5077..80a6c4793bbed 100644
--- a/superset-frontend/src/views/CRUD/hooks.ts
+++ b/superset-frontend/src/views/CRUD/hooks.ts
@@ -420,7 +420,7 @@ export function useImportResource(
       const formData = new FormData();
       formData.append('formData', bundle);
 
-      const reexportText = t(
+      const RE_EXPORT_TEXT = t(
         'Please re-export your file and try importing again',
       );
 
@@ -472,7 +472,7 @@ export function useImportResource(
                   resourceLabel,
                   [
                     ...error.errors.map(payload => payload.message),
-                    reexportText,
+                    RE_EXPORT_TEXT,
                   ].join('.\n'),
                 ),
               );
diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
index 56fd9bc3d5427..a5bea92ffa11e 100644
--- a/superset/connectors/base/models.py
+++ b/superset/connectors/base/models.py
@@ -249,10 +249,10 @@ def data(self) -> Dict[str, Any]:
         for column_name in self.column_names:
             column_name = str(column_name or "")
             order_by_choices.append(
-                (json.dumps([column_name, True]), column_name + __(" [asc]"))
+                (json.dumps([column_name, True]), f"{column_name} " + __("[asc]"))
             )
             order_by_choices.append(
-                (json.dumps([column_name, False]), column_name + __(" [desc]"))
+                (json.dumps([column_name, False]), f"{column_name} " + __("[desc]"))
             )
 
         verbose_map = {"__timestamp": "Time"}
diff --git a/superset/models/sql_lab.py b/superset/models/sql_lab.py
index 460406e6837e2..d06034912868e 100644
--- a/superset/models/sql_lab.py
+++ b/superset/models/sql_lab.py
@@ -225,10 +225,10 @@ def data(self) -> Dict[str, Any]:
         for col in self.columns:
             column_name = str(col.get("column_name") or "")
             order_by_choices.append(
-                (json.dumps([column_name, True]), column_name + __(" [asc]"))
+                (json.dumps([column_name, True]), f"{column_name} " + __("[asc]"))
             )
             order_by_choices.append(
-                (json.dumps([column_name, False]), column_name + __(" [desc]"))
+                (json.dumps([column_name, False]), f"{column_name} " + __("[desc]"))
             )
 
         return {

From 4e494038e5178c5668ee7288d6c4019574660245 Mon Sep 17 00:00:00 2001
From: artemonsh <shumeykoartem@mail.ru>
Date: Fri, 27 Jan 2023 21:35:37 +0300
Subject: [PATCH 16/16] fix

---
 superset-frontend/src/SqlLab/actions/sqlLab.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/actions/sqlLab.js b/superset-frontend/src/SqlLab/actions/sqlLab.js
index c07ebfe683b5b..39185c9e314de 100644
--- a/superset-frontend/src/SqlLab/actions/sqlLab.js
+++ b/superset-frontend/src/SqlLab/actions/sqlLab.js
@@ -1402,7 +1402,7 @@ export function popQuery(queryId) {
           dbId: queryData.database.id,
           schema: queryData.schema,
           sql: queryData.sql,
-          title: t('Copy of %s', queryData.tab_name),
+          name: t('Copy of %s', queryData.tab_name),
           autorun: false,
         };
         return dispatch(addQueryEditor(queryEditorProps));
@@ -1420,7 +1420,7 @@ export function popDatasourceQuery(datasourceKey, sql) {
       .then(({ json }) =>
         dispatch(
           addQueryEditor({
-            title: `${QUERY_TEXT} ${json.result.name}`,
+            name: `${QUERY_TEXT} ${json.result.name}`,
             dbId: json.result.database.id,
             schema: json.result.schema,
             autorun: sql !== undefined,