diff --git a/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts b/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts index 2ab040ab6..c9b7a5b0a 100644 --- a/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/chart_list/list_view.test.ts @@ -30,11 +30,11 @@ describe('chart list view', () => { cy.get('[data-test="listview-table"]').should('be.visible'); // check chart list view header cy.get('[data-test="sort-header"]').eq(1).contains('Chart'); - cy.get('[data-test="sort-header"]').eq(2).contains('Visualization Type'); + cy.get('[data-test="sort-header"]').eq(2).contains('Visualization type'); cy.get('[data-test="sort-header"]').eq(3).contains('Dataset'); - cy.get('[data-test="sort-header"]').eq(4).contains('Modified By'); - cy.get('[data-test="sort-header"]').eq(5).contains('Last Modified'); - cy.get('[data-test="sort-header"]').eq(6).contains('Created By'); + cy.get('[data-test="sort-header"]').eq(4).contains('Modified by'); + cy.get('[data-test="sort-header"]').eq(5).contains('Last modified'); + cy.get('[data-test="sort-header"]').eq(6).contains('Created by'); cy.get('[data-test="sort-header"]').eq(7).contains('Actions'); cy.get('[data-test="table-row"]').should('have.length', 25); }); diff --git a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts index 889428ab2..dd92585e9 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/line.test.ts @@ -35,10 +35,10 @@ describe('Visualization > Line', () => { it('should preload mathjs', () => { cy.get('script[src*="mathjs"]').should('have.length', 1); - cy.contains('Add Annotation Layer').scrollIntoView().click(); + cy.contains('Add annotation layer').scrollIntoView().click(); // should not load additional mathjs cy.get('script[src*="mathjs"]').should('have.length', 1); - cy.contains('Layer Configuration'); + cy.contains('Layer configuration'); }); it('should not show validator error when metric added', () => { diff --git a/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx index 54d14223c..990928cf9 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx @@ -80,12 +80,12 @@ describe('AnnotationModal', () => { const addWrapper = await mountAndWait({}); expect( addWrapper.find('[data-test="annotaion-modal-title"]').text(), - ).toEqual('Add Annotation'); + ).toEqual('Add annotation'); }); it('renders edit header when annotation prop is included', () => { expect(wrapper.find('[data-test="annotaion-modal-title"]').text()).toEqual( - 'Edit Annotation', + 'Edit annotation', ); }); diff --git a/superset-frontend/spec/javascripts/views/CRUD/annotationlayers/AnnotationLayerModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/annotationlayers/AnnotationLayerModal_spec.jsx index 64fd55b9f..a9add984b 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/annotationlayers/AnnotationLayerModal_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/annotationlayers/AnnotationLayerModal_spec.jsx @@ -73,13 +73,13 @@ describe('AnnotationLayerModal', () => { const addWrapper = await mountAndWait({}); expect( addWrapper.find('[data-test="annotation-layer-modal-title"]').text(), - ).toEqual('Add Annotation Layer'); + ).toEqual('Add annotation layer'); }); it('renders edit header when layer prop is included', () => { expect( wrapper.find('[data-test="annotation-layer-modal-title"]').text(), - ).toEqual('Edit Annotation Layer Properties'); + ).toEqual('Edit annotation layer properties'); }); it('renders input element for name', () => { diff --git a/superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplateModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplateModal_spec.jsx index 1e3d3bffb..c3b8289ae 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplateModal_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplateModal_spec.jsx @@ -74,13 +74,13 @@ describe('CssTemplateModal', () => { const addWrapper = await mountAndWait({}); expect( addWrapper.find('[data-test="css-template-modal-title"]').text(), - ).toEqual('Add CSS Template'); + ).toEqual('Add CSS template'); }); it('renders edit header when css template prop is included', () => { expect( wrapper.find('[data-test="css-template-modal-title"]').text(), - ).toEqual('Edit CSS Template Properties'); + ).toEqual('Edit CSS template properties'); }); it('renders input elements for template name', () => { diff --git a/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx b/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx index 21fb62442..863e994c1 100644 --- a/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx +++ b/superset-frontend/src/SqlLab/components/TemplateParamsEditor.jsx @@ -122,7 +122,7 @@ export default class TemplateParamsEditor extends React.Component { : 0; return ( {`${t('Parameters')} `} diff --git a/superset-frontend/src/SqlLab/reducers/getInitialState.js b/superset-frontend/src/SqlLab/reducers/getInitialState.js index 9f7a0a108..60cd420da 100644 --- a/superset-frontend/src/SqlLab/reducers/getInitialState.js +++ b/superset-frontend/src/SqlLab/reducers/getInitialState.js @@ -41,7 +41,7 @@ export default function getInitialState({ const defaultQueryEditor = { id: null, loaded: true, - title: t('Untitled Query'), + title: t('Untitled query'), sql: 'SELECT *\nFROM\nWHERE', selectedText: null, latestQueryId: null, diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx b/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx index 1c65c56e7..21d4de1e7 100644 --- a/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx +++ b/superset-frontend/src/explore/components/controls/AnnotationLayer.jsx @@ -698,7 +698,7 @@ export default class AnnotationLayer extends React.PureComponent { {}} - title={t('Layer Configuration')} + title={t('Layer configuration')} info={t('Configure the basics of your Annotation Layer.')} > @@ -200,7 +200,7 @@ class AnnotationLayerControl extends React.PureComponent { data-test="add-annotation-layer-button" className="fa fa-plus" />{' '} -   {t('Add Annotation Layer')} +   {t('Add annotation layer')} diff --git a/superset-frontend/src/views/CRUD/alert/AlertList.tsx b/superset-frontend/src/views/CRUD/alert/AlertList.tsx index 736ec4e75..192b0f582 100644 --- a/superset-frontend/src/views/CRUD/alert/AlertList.tsx +++ b/superset-frontend/src/views/CRUD/alert/AlertList.tsx @@ -210,7 +210,7 @@ function AlertList({ ? moment.utc(lastEvalDttm).local().format(DATETIME_WITH_TIME_ZONE) : '', accessor: 'last_eval_dttm', - Header: t('Last Run'), + Header: t('Last run'), size: 'lg', }, { @@ -242,7 +242,7 @@ function AlertList({ )), accessor: 'recipients', - Header: t('Notification Method'), + Header: t('Notification method'), disableSortBy: true, size: 'xl', }, @@ -289,7 +289,7 @@ function AlertList({ canEdit ? { label: 'execution-log-action', - tooltip: t('Execution Log'), + tooltip: t('Execution log'), placement: 'bottom', icon: 'note' as IconName, onClick: handleGotoExecutionLog, @@ -344,7 +344,7 @@ function AlertList({ } if (canDelete) { subMenuButtons.push({ - name: t('Bulk Select'), + name: t('Bulk select'), onClick: toggleBulkSelect, buttonStyle: 'secondary', 'data-test': 'bulk-select-toggle', @@ -365,7 +365,7 @@ function AlertList({ const filters: Filters = useMemo( () => [ { - Header: t('Created By'), + Header: t('Created by'), id: 'created_by', input: 'select', operator: FilterOperators.relationOneMany, @@ -408,7 +408,7 @@ function AlertList({ <> =', }, { - label: t('== (Is Equal)'), + label: t('== (Is equal)'), value: '==', }, { - label: t('!= (Is Not Equal)'), + label: t('!= (Is not equal)'), value: '!=', }, { - label: t('Not Null'), + label: t('Not null'), value: 'not null', }, ]; @@ -1060,7 +1060,7 @@ const AlertReportModal: FunctionComponent = ({
- {isReport ? t('Report Name') : t('Alert Name')} + {isReport ? t('Report name') : t('Alert name')} *
@@ -1068,7 +1068,7 @@ const AlertReportModal: FunctionComponent = ({ type="text" name="name" value={currentAlert ? currentAlert.name : ''} - placeholder={isReport ? t('Report Name') : t('Alert Name')} + placeholder={isReport ? t('Report name') : t('Alert name')} onChange={onTextChange} />
@@ -1114,7 +1114,7 @@ const AlertReportModal: FunctionComponent = ({ {!isReport && (
-

{t('Alert Condition')}

+

{t('Alert condition')}

@@ -1210,8 +1210,8 @@ const AlertReportModal: FunctionComponent = ({

{isReport - ? t('Report Schedule') - : t('Alert Condition Schedule')} + ? t('Report schedule') + : t('Alert condition schedule')}

= ({ onChange={newVal => updateAlertState('crontab', newVal)} /> -

{t('Schedule Settings')}

+

{t('Schedule settings')}

- {t('Log Retention')} + {t('Log retention')} *
@@ -1249,7 +1249,7 @@ const AlertReportModal: FunctionComponent = ({
- {t('Working Timeout')} + {t('Working timeout')} *
@@ -1264,7 +1264,7 @@ const AlertReportModal: FunctionComponent = ({
-
{t('Grace Period')}
+
{t('Grace period')}
= ({
-

{t('Message Content')}

+

{t('Message content')}

@@ -1328,7 +1328,7 @@ const AlertReportModal: FunctionComponent = ({ onChange={onDashboardChange} /> -

{t('Notification Method')}

+

{t('Notification method')}

moment(new Date(startDttm)).format('MM/DD/YYYY hh:mm:ss a'), - Header: t('Start At'), + Header: t('Start at'), accessor: 'start_dttm', }, { @@ -124,7 +124,7 @@ function ExecutionLog({ addDangerToast, isReportEnabled }: ExecutionLogProps) { }, { accessor: 'error_message', - Header: t('Error Message'), + Header: t('Error message'), }, ], [isReportEnabled], diff --git a/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx b/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx index 74bdccfee..2e8b2d599 100644 --- a/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx +++ b/superset-frontend/src/views/CRUD/alert/components/AlertReportCronScheduler.tsx @@ -74,7 +74,7 @@ export const AlertReportCronScheduler: FunctionComponent { onChange(event.target.value); diff --git a/superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx b/superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx index 6bbfa06c6..6b83d47e9 100644 --- a/superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx +++ b/superset-frontend/src/views/CRUD/alert/components/AlertStatusIcon.tsx @@ -59,27 +59,27 @@ export default function AlertStatusIcon({ case AlertState.success: lastStateConfig.name = isReportEnabled ? 'check' : 'alert-solid-small'; lastStateConfig.label = isReportEnabled - ? t('Report Sent') - : t('Alert Triggered, Notification Sent'); + ? t('Report sent') + : t('Alert triggered, notification sent'); lastStateConfig.status = AlertState.success; break; case AlertState.working: lastStateConfig.name = 'running'; lastStateConfig.label = isReportEnabled - ? t('Report Sending') - : t('Alert Running'); + ? t('Report sending') + : t('Alert running'); lastStateConfig.status = AlertState.working; break; case AlertState.error: lastStateConfig.name = 'x-small'; lastStateConfig.label = isReportEnabled - ? t('Report Failed') - : t('Alert Failed'); + ? t('Report failed') + : t('Alert failed'); lastStateConfig.status = AlertState.error; break; case AlertState.noop: lastStateConfig.name = 'check'; - lastStateConfig.label = t('Nothing Triggered'); + lastStateConfig.label = t('Nothing triggered'); lastStateConfig.status = AlertState.noop; break; case AlertState.grace: @@ -89,7 +89,7 @@ export default function AlertStatusIcon({ break; default: lastStateConfig.name = 'check'; - lastStateConfig.label = t('Nothing Triggered'); + lastStateConfig.label = t('Nothing triggered'); lastStateConfig.status = AlertState.noop; } return ( diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx b/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx index d1b7ef535..bdcbf4116 100644 --- a/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx +++ b/superset-frontend/src/views/CRUD/annotation/AnnotationList.tsx @@ -177,14 +177,14 @@ function AnnotationList({ const actions = [ { label: 'edit-action', - tooltip: t('Edit Annotation'), + tooltip: t('Edit annotation'), placement: 'bottom', icon: 'edit' as IconName, onClick: handleEdit, }, { label: 'delete-action', - tooltip: t('Delete Annotation'), + tooltip: t('Delete annotation'), placement: 'bottom', icon: 'trash' as IconName, onClick: handleDelete, @@ -215,7 +215,7 @@ function AnnotationList({ }); subMenuButtons.push({ - name: t('Bulk Select'), + name: t('Bulk select'), onClick: toggleBulkSelect, buttonStyle: 'secondary', 'data-test': 'annotation-bulk-select', diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx index 246e0df3b..b59d8df3d 100644 --- a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx +++ b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx @@ -262,16 +262,16 @@ const AnnotationModal: FunctionComponent = ({ ) : ( )} - {isEditMode ? t('Edit Annotation') : t('Add Annotation')} + {isEditMode ? t('Edit annotation') : t('Add annotation')} } > -

{t('Basic Information')}

+

{t('Basic information')}

- {t('annotation name')} + {t('Annotation name')} *
= ({ />
-

{t('Additional Information')}

+

{t('Additional information')}

{t('description')}
@@ -316,7 +316,7 @@ const AnnotationModal: FunctionComponent = ({ />
-
{t('json metadata')}
+
{t('JSON metadata')}
= ({ )} {isEditMode - ? t('Edit Annotation Layer Properties') - : t('Add Annotation Layer')} + ? t('Edit annotation layer properties') + : t('Add annotation layer')} } > -

{t('Basic Information')}

+

{t('Basic information')}

- {t('annotation layer name')} + {t('Annotation layer name')} *
( 'annotation_layer', - t('annotation layers'), + t('Annotation layers'), addDangerToast, ); @@ -178,7 +178,7 @@ function AnnotationLayersList({ return moment(utc).format(MOMENT_FORMAT); }, - Header: t('Last Modified'), + Header: t('Last modified'), accessor: 'changed_on', size: 'xl', }, @@ -203,14 +203,14 @@ function AnnotationLayersList({ return moment(utc).format(MOMENT_FORMAT); }, - Header: t('Created On'), + Header: t('Created on'), accessor: 'created_on', size: 'xl', }, { accessor: 'created_by', disableSortBy: true, - Header: t('Created By'), + Header: t('Created by'), Cell: ({ row: { original: { created_by: createdBy }, @@ -263,7 +263,7 @@ function AnnotationLayersList({ subMenuButtons.push({ name: ( <> - {t('Annotation Layer')} + {t('Annotation layer')} ), buttonStyle: 'primary', @@ -275,7 +275,7 @@ function AnnotationLayersList({ if (canDelete) { subMenuButtons.push({ - name: t('Bulk Select'), + name: t('Bulk select'), onClick: toggleBulkSelect, buttonStyle: 'secondary', }); @@ -284,7 +284,7 @@ function AnnotationLayersList({ const filters: Filters = useMemo( () => [ { - Header: t('Created By'), + Header: t('Created by'), id: 'created_by', input: 'select', operator: 'rel_o_m', @@ -320,7 +320,7 @@ function AnnotationLayersList({ }} > <> - {t('Annotation Layer')} + {t('Annotation layer')} ); @@ -336,7 +336,7 @@ function AnnotationLayersList({ return ( <> - + {t('Are you sure you want to delete')} {chart.slice_name} diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx index f262578b0..2148fc030 100644 --- a/superset-frontend/src/views/CRUD/chart/ChartList.tsx +++ b/superset-frontend/src/views/CRUD/chart/ChartList.tsx @@ -217,7 +217,7 @@ function ChartList(props: ChartListProps) { original: { viz_type: vizType }, }, }: any) => registry.get(vizType)?.name || vizType, - Header: t('Visualization Type'), + Header: t('Visualization type'), accessor: 'viz_type', size: 'xxl', }, @@ -244,7 +244,7 @@ function ChartList(props: ChartListProps) { }, }, }: any) => {changedByName}, - Header: t('Modified By'), + Header: t('Modified by'), accessor: 'changed_by.first_name', size: 'xl', }, @@ -254,7 +254,7 @@ function ChartList(props: ChartListProps) { original: { changed_on_delta_humanized: changedOn }, }, }: any) => {changedOn}, - Header: t('Last Modified'), + Header: t('Last modified'), accessor: 'changed_on_delta_humanized', size: 'xl', }, @@ -270,7 +270,7 @@ function ChartList(props: ChartListProps) { }, }: any) => createdBy ? `${createdBy.first_name} ${createdBy.last_name}` : '', - Header: t('Created By'), + Header: t('Created by'), accessor: 'created_by', disableSortBy: true, size: 'xl', @@ -294,7 +294,7 @@ function ChartList(props: ChartListProps) { {canDelete && ( {t('Are you sure you want to delete')}{' '} @@ -388,7 +388,7 @@ function ChartList(props: ChartListProps) { paginate: true, }, { - Header: t('Created By'), + Header: t('Created by'), id: 'created_by', input: 'select', operator: FilterOperators.relationOneMany, @@ -409,7 +409,7 @@ function ChartList(props: ChartListProps) { paginate: true, }, { - Header: t('Viz Type'), + Header: t('Viz type'), id: 'viz_type', input: 'select', operator: FilterOperators.equals, @@ -480,13 +480,13 @@ function ChartList(props: ChartListProps) { { desc: true, id: 'changed_on_delta_humanized', - label: 'Recently Modified', + label: 'Recently modified', value: 'recently_modified', }, { desc: false, id: 'changed_on_delta_humanized', - label: 'Least Recently Modified', + label: 'Least recently modified', value: 'least_recently_modified', }, ]; @@ -510,7 +510,7 @@ function ChartList(props: ChartListProps) { const subMenuButtons: SubMenuProps['buttons'] = []; if (canDelete || canExport) { subMenuButtons.push({ - name: t('Bulk Select'), + name: t('Bulk select'), buttonStyle: 'secondary', onClick: toggleBulkSelect, }); diff --git a/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx b/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx index b2250da9d..e7f1c3735 100644 --- a/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx +++ b/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx @@ -233,17 +233,17 @@ const CssTemplateModal: FunctionComponent = ({ )} {isEditMode - ? t('Edit CSS Template Properties') - : t('Add CSS Template')} + ? t('Edit CSS template properties') + : t('Add CSS template')} } > -

{t('Basic Information')}

+

{t('Basic information')}

- {t('css template name')} + {t('CSS template name')} *
( 'css_template', - t('css templates'), + t('CSS templates'), addDangerToast, ); const [cssTemplateModalOpen, setCssTemplateModalOpen] = useState( @@ -155,7 +155,7 @@ function CssTemplatesList({ ); }, - Header: t('Last Modified'), + Header: t('Last modified'), accessor: 'changed_on_delta_humanized', size: 'xl', disableSortBy: true, @@ -181,7 +181,7 @@ function CssTemplatesList({ return moment(utc).fromNow(); }, - Header: t('Created On'), + Header: t('Created on'), accessor: 'created_on', size: 'xl', disableSortBy: true, @@ -189,7 +189,7 @@ function CssTemplatesList({ { accessor: 'created_by', disableSortBy: true, - Header: t('Created By'), + Header: t('Created by'), Cell: ({ row: { original: { created_by: createdBy }, @@ -237,7 +237,7 @@ function CssTemplatesList({ ); const menuData: SubMenuProps = { - name: t('CSS Templates'), + name: t('CSS templates'), }; const subMenuButtons: SubMenuProps['buttons'] = []; @@ -246,7 +246,7 @@ function CssTemplatesList({ subMenuButtons.push({ name: ( <> - {t('Css Template')} + {t('CSS template')} ), buttonStyle: 'primary', @@ -259,7 +259,7 @@ function CssTemplatesList({ if (canDelete) { subMenuButtons.push({ - name: t('Bulk Select'), + name: t('Bulk select'), onClick: toggleBulkSelect, buttonStyle: 'secondary', }); @@ -270,7 +270,7 @@ function CssTemplatesList({ const filters: Filters = useMemo( () => [ { - Header: t('Created By'), + Header: t('Created by'), id: 'created_by', input: 'select', operator: 'rel_o_m',