From 50c54d944de7593bc0d9bbd9b55a1b3437a57c1c Mon Sep 17 00:00:00 2001 From: Shailesh Parmar Date: Fri, 3 Mar 2023 16:14:55 +0530 Subject: [PATCH] ui: refactor localization file (#10411) * ui: refactor localization file * addressing comments * fixed failing unit test --- .../DashboardVersion.component.tsx | 8 ++++-- .../DatasetDetails.component.tsx | 2 +- .../MlModelVersion.component.tsx | 6 ++--- .../ProfilerDashboard.test.tsx | 4 +-- .../ProfilerDashboard/ProfilerDashboard.tsx | 4 ++- .../SearchDropdown/SearchDropdown.tsx | 4 ++- .../components/TeamDetails/TeamDetailsV1.tsx | 8 +++--- .../TestCasesTab/TestCasesTab.component.tsx | 6 ++++- .../ui/src/components/UserList/UserListV1.tsx | 12 +++++++-- .../src/components/Users/Users.component.tsx | 2 +- .../DBTConfigFormBuilder.test.tsx | 2 +- .../ErrorPlaceHolder.tsx | 4 +-- .../common/facetfilter/FacetFilter.tsx | 4 ++- .../ui/src/constants/profiler.constant.ts | 7 ++++- .../src/constants/service-guide.constant.ts | 2 +- .../ui/src/locale/languages/en-us.json | 27 ++++++------------- .../RequestDescriptionPage.tsx | 4 ++- .../RequestTagPage/RequestTagPage.tsx | 4 ++- .../UpdateDescriptionPage.tsx | 4 ++- .../TasksPage/UpdateTagPage/UpdateTagPage.tsx | 4 ++- .../pages/TasksPage/shared/ColumnDetail.tsx | 4 ++- .../ui/src/utils/DatasetDetailsUtils.ts | 2 +- 22 files changed, 75 insertions(+), 49 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx index 647c8c3641e..580bd93c79e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx @@ -213,7 +213,9 @@ const DashboardVersion: FC = ({ const tableColumn: ColumnsType = useMemo( () => [ { - title: t('label.chart-name'), + title: t('label.chart-entity', { + entity: t('label.name'), + }), dataIndex: 'name', key: 'name', render: (text, record) => ( @@ -231,7 +233,9 @@ const DashboardVersion: FC = ({ ), }, { - title: t('label.chart-type'), + title: t('label.chart-entity', { + entity: t('label.type'), + }), dataIndex: 'type', key: 'type', }, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx index 149a4a01421..aa6ea5b5124 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx @@ -296,7 +296,7 @@ const DatasetDetails: React.FC = ({ position: 7, }, { - name: t('label.dbt-uppercase'), + name: t('label.dbt-lowercase'), icon: { alt: 'dbt-model', name: 'dbtmodel-light-grey', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx index 636936648d4..3f7788a3103 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx @@ -108,7 +108,7 @@ const MlModelVersion: FC = ({ { key: 'Target', value: target - ? t('label.entity-with-value', { + ? t('label.entity-hyphen-value', { entity: t('label.target'), value: target, }) @@ -119,7 +119,7 @@ const MlModelVersion: FC = ({ { key: 'Server', value: server - ? t('label.entity-with-value', { + ? t('label.entity-hyphen-value', { entity: t('label.server'), value: server, }) @@ -130,7 +130,7 @@ const MlModelVersion: FC = ({ { key: 'Dashboard', value: dashboard - ? t('label.entity-with-value', { + ? t('label.entity-hyphen-value', { entity: t('label.dashboard'), value: dashboard, }) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/ProfilerDashboard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/ProfilerDashboard.test.tsx index 918cd4f3966..1583a361930 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/ProfilerDashboard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/ProfilerDashboard.test.tsx @@ -142,9 +142,7 @@ describe('Test ProfilerDashboardPage component', () => { const EntityPageInfo = await screen.findByText('EntityPageInfo component'); const ProfilerTab = screen.queryByText('ProfilerTab component'); const DataQualityTab = await screen.findByText('DataQualityTab component'); - const deletedTestSwitch = await screen.findByText( - 'label.deleted-test-plural' - ); + const deletedTestSwitch = await screen.findByText('label.deleted-entity'); const statusDropdown = await screen.findByText('label.status'); expect(profilerSwitch).toBeInTheDocument(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/ProfilerDashboard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/ProfilerDashboard.tsx index 518b1633e2a..ccd2f110fc1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/ProfilerDashboard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/ProfilerDashboard.tsx @@ -515,7 +515,9 @@ const ProfilerDashboard: React.FC = ({ <> + label={t('label.deleted-entity', { + entity: t('label.test-plural'), + })}> = ({ data-testid="clear-button" type="link" onClick={handleClear}> - {t('label.clear-all')} + {t('label.clear-entity', { + entity: t('label.all'), + })} )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx index a86e8abc58f..0ecdd664075 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx @@ -665,9 +665,11 @@ const TeamDetailsV1 = ({ - {t('label.deleted-team-action', { - action: showDeletedTeam ? t('label.hide') : t('label.show'), - })} + {t( + showDeletedTeam + ? 'label.hide-deleted-team' + : 'label.show-deleted-team' + )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestCasesTab/TestCasesTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TestCasesTab/TestCasesTab.component.tsx index ee0dc8a0d9c..0a11a89c6ae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestCasesTab/TestCasesTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TestCasesTab/TestCasesTab.component.tsx @@ -73,7 +73,11 @@ const TestCasesTab = ({ testCasePageHandler={testCasePageHandler}> <> - {t('label.deleted-test-plural')} + + {t('label.deleted-entity', { + entity: t('label.test-plural'), + })} + diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx index 9a7fc0acd49..7784862a8fd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserListV1.tsx @@ -190,7 +190,11 @@ const UserListV1: FC = ({ size="small" onClick={onShowDeletedUserChange} /> - {t('label.deleted-user-plural')} + + {t('label.deleted-entity', { + entity: t('label.user-plural'), + })} + @@ -232,7 +236,11 @@ const UserListV1: FC = ({ checked={showDeletedUser} onClick={onShowDeletedUserChange} /> - {t('label.deleted-user-plural')} + + {t('label.deleted-entity', { + entity: t('label.user-plural'), + })} + setIsChangePassword(true)}> - {t('label.change-password')} + {t('label.change-entity', { entity: t('label.password-lowercase') })} {' '} - {t('label.adding-new-entity-is-easy-just-give-it-a-spin', { + {t('message.adding-new-entity-is-easy-just-give-it-a-spin', { entity: heading, })} @@ -100,7 +100,7 @@ const ErrorPlaceHolder = ({ {t('message.no-data-available')} - {t('label.adding-new-entity-is-easy-just-give-it-a-spin', { + {t('message.adding-new-entity-is-easy-just-give-it-a-spin', { entity: heading, })} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx index f2641f882f6..de317911f91 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/facetfilter/FacetFilter.tsx @@ -108,7 +108,9 @@ const FacetFilter: React.FC = ({ disabled={isEmpty(filters)} type="link" onClick={() => onClearFilter({})}> - {t('label.clear-all')} + {t('label.clear-entity', { + entity: t('label.all'), + })}
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/profiler.constant.ts b/openmetadata-ui/src/main/resources/ui/src/constants/profiler.constant.ts index 2d2dddaa9a8..d164b344979 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/profiler.constant.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/profiler.constant.ts @@ -285,7 +285,12 @@ export const codeMirrorOption = { export const STEPS_FOR_ADD_TEST_CASE: Array = [ { name: t('label.select-add-test-suite'), step: 1 }, - { name: t('label.configure-test-case'), step: 2 }, + { + name: t('label.configure-entity', { + entity: t('label.test-case-lowercase'), + }), + step: 2, + }, ]; export const SUPPORTED_PARTITION_TYPE = [ diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/service-guide.constant.ts b/openmetadata-ui/src/main/resources/ui/src/constants/service-guide.constant.ts index 1bf61bed21a..7aa281023f5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/service-guide.constant.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/service-guide.constant.ts @@ -168,7 +168,7 @@ export const addDBTIngestionGuide = [ { step: 5, title: i18n.t('label.entity-ingestion-added-successfully', { - entity: i18n.t('label.dbt-uppercase'), + entity: i18n.t('label.dbt-lowercase'), }), description: i18n.t( 'message.ingestion-pipeline-name-successfully-deployed-entity', diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index 856658f1999..397a0462931 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -26,7 +26,6 @@ "added-lowercase": "added", "added-yet-lowercase": "added yet.", "adding-new-classification": "Adding New Classification", - "adding-new-entity-is-easy-just-give-it-a-spin": "Adding a new {{entity}} is easy, just give it a spin!", "adding-new-tag": "Adding new tag on {{categoryName}}", "address": "Address", "admin": "Admin", @@ -83,23 +82,19 @@ "bot-lowercase": "bot", "bot-plural": "Bots", "broker-plural": "Brokers", - "browse-csv-file": "Browse csv file", + "browse-csv-file": "Browse CSV file", "ca-certs": "CA Certs", "cancel": "Cancel", "change-entity": "Change {{entity}}", - "change-password": "Change password", "chart": "Chart", "chart-entity": "Chart {{entity}}", - "chart-name": "Chart Name", "chart-plural": "Charts", - "chart-type": "Chart Type", "check-status": "Check status", "claim-ownership": "Claim Ownership", "classification": "Classification", "classification-lowercase": "classification", "classification-plural": "Classifications", "clean-up-policy-plural-lowercase": "clean-up policies", - "clear-all": "Clear All", "clear-entity": "Clear {{entity}}", "click-here": "Click here", "client-email": "Client Email", @@ -114,11 +109,8 @@ "cloud-config-source": "Cloud Config Source", "collapse-all": "Collapse All", "column": "Column", - "column-details": "Column Details", "column-entity": "Column {{entity}}", "column-plural": "Columns", - "column-type": "Column type", - "columns-plural": "Columns", "comment-lowercase": "comment", "completed": "Completed", "completed-entity": "Completed {{entity}}", @@ -127,8 +119,6 @@ "configure-a-service": "Configure a Service", "configure-dbt-model": "Configure dbt Model", "configure-entity": "Configure {{entity}}", - "configure-glossary-term": "Configure Glossary Term", - "configure-test-case": "Configure test case", "confirm": "Confirm", "confirm-lowercase": "confirm", "confirm-new-password": "Confirm New Password", @@ -204,13 +194,12 @@ "dbt-cloud-project-id": "dbt Cloud Project Id", "dbt-cloud-url": "dbt Cloud URL", "dbt-configuration-source": "dbt Configuration Source", - "dbt-ingestion": "DBT Ingestion", + "dbt-ingestion": "dbt Ingestion", "dbt-lowercase": "dbt", "dbt-object-prefix": "dbt Object Prefix", "dbt-run-result-file-path": "dbt Run Results File Path", "dbt-run-result-http-path": "dbt Run Results HTTP Path", - "dbt-source": "DBT Source", - "dbt-uppercase": "DBT", + "dbt-source": "dbt Source", "deactivated": "Deactivated", "december": "December", "delete": "Delete", @@ -221,10 +210,6 @@ "deleted": "Deleted", "deleted-entity": "Deleted {{entity}}", "deleted-lowercase": "deleted", - "deleted-team-action": "{{action}} Deleted Team", - "deleted-test-plural": "Deleted Tests", - "deleted-tests": "Deleted Tests", - "deleted-user-plural": "Deleted Users", "deleting-lowercase": "deleting", "deploy": "Deploy", "deployed": "Deployed", @@ -279,13 +264,13 @@ "enter-type-password": "Enter {{type}} Password", "entity-count": "{{entity}} Count", "entity-does-not-have-followers": "{{entityName}} doesn't have any followers yet", + "entity-hyphen-value": "{{entity}} - {{value}}", "entity-index": "{{entity}} index", "entity-ingestion-added-successfully": "{{entity}} Ingestion Added Successfully", "entity-name": "{{entity}} Name", "entity-plural": "Entities", "entity-proportion": "{{entity}} Proportion", "entity-service": "{{entity}} Service", - "entity-with-value": "{{entity}} - {{value}}", "event-publisher-plural": "Event Publishers", "event-type": "Event Type", "every": "Every", @@ -360,6 +345,7 @@ "has-been-action-type-lowercase": "has been {{actionType}}", "here-lowercase": "here", "hide": "Hide", + "hide-deleted-team": "Hide Deleted Team", "home": "Home", "hour": "Hour", "http-config-source": "HTTP Config Source", @@ -692,6 +678,7 @@ "shift": "Shift", "show": "Show", "show-deleted": "Show Deleted", + "show-deleted-team": "Show Deleted Team", "show-or-hide-advanced-config": "{{showAdv}} Advanced Config", "sign-in-with-sso": "Sign in with {{sso}}", "slack": "Slack", @@ -754,6 +741,7 @@ "term-plural": "Terms", "test": "Test", "test-case": "Test case", + "test-case-lowercase": "test case", "test-case-plural": "Test Cases", "test-connection": "Test Connection", "test-entity": "Test {{entity}}", @@ -863,6 +851,7 @@ "add-policy-message": "Policies are assigned to teams. In OpenMetadata, a policy is a collection of rules, which define access based on certain conditions. We support rich SpEL (Spring Expression Language) based conditions. All the operations supported by an entity are published. Use these fine grained operations to define the conditional rules for each policy. Create well-defined policies based on conditional rules to build rich access control roles.", "add-role-message": "Roles are assigned to Users. In OpenMetadata, Roles are a collection of Policies. Each Role must have at least one policy attached to it. A Role supports multiple policies with a one to many relationship. Ensure that the necessary policies are created before creating a new role. Build rich access control roles with well-defined policies based on conditional rules.", "add-service-connection": "Start by adding a service connection to ingest data into OpenMetadata.", + "adding-new-entity-is-easy-just-give-it-a-spin": "Adding a new {{entity}} is easy, just give it a spin!", "adding-new-tag": "Adding new tag on {{categoryName}}", "adding-new-user-to-entity": "Adding new users to {{entity}}", "admin-only-action": "Only an Admin can perform this action.", diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestDescriptionPage/RequestDescriptionPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestDescriptionPage/RequestDescriptionPage.tsx index ffbd641d304..a4867116bba 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestDescriptionPage/RequestDescriptionPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestDescriptionPage/RequestDescriptionPage.tsx @@ -115,7 +115,9 @@ const RequestDescription = () => { return (
-

{t('label.column-details')}

+

+ {t('label.column-entity', { entity: t('label.detail-plural') })} +

{`${t('label.type')}:`}{' '} {columnObject.dataTypeDisplay} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestTagPage/RequestTagPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestTagPage/RequestTagPage.tsx index ab4a328412d..b8e4d676ed4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestTagPage/RequestTagPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestTagPage/RequestTagPage.tsx @@ -107,7 +107,9 @@ const RequestTag = () => { return (

-

{t('label.column-details')}

+

+ {t('label.column-entity', { entity: t('label.detail-plural') })} +

{`${t('label.type')}:`}{' '} {columnObject.dataTypeDisplay} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateDescriptionPage/UpdateDescriptionPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateDescriptionPage/UpdateDescriptionPage.tsx index ac8c4fc6399..0e01a69e1dd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateDescriptionPage/UpdateDescriptionPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateDescriptionPage/UpdateDescriptionPage.tsx @@ -113,7 +113,9 @@ const UpdateDescription = () => { if (!isNil(field) && !isNil(value) && field === EntityField.COLUMNS) { return (

-

{t('label.column-details')}

+

+ {t('label.column-entity', { entity: t('label.detail-plural') })} +

{`${t('label.type')}:`}{' '} {columnObject.dataTypeDisplay} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateTagPage/UpdateTagPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateTagPage/UpdateTagPage.tsx index 5a51e0ad6e2..8816c9034ae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateTagPage/UpdateTagPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateTagPage/UpdateTagPage.tsx @@ -108,7 +108,9 @@ const UpdateTag = () => { if (!isNil(field) && !isNil(value) && field === EntityField.COLUMNS) { return (

-

{t('label.column-details')}

+

+ {t('label.column-entity', { entity: t('label.detail-plural') })} +

{`${t('label.type')}:`}{' '} {columnObject.dataTypeDisplay} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/ColumnDetail.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/ColumnDetail.tsx index b2134646b53..468f6f6e1e5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/ColumnDetail.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/ColumnDetail.tsx @@ -27,7 +27,9 @@ const ColumnDetail = ({ column }: { column: Column }) => { - {`${t('label.column-type')}:`} + {`${t('label.column-entity', { + entity: t('label.type-lowercase'), + })}:`}