diff --git a/locales/en/plugin__odf-console.json b/locales/en/plugin__odf-console.json index f8e208225..37dd55ead 100644 --- a/locales/en/plugin__odf-console.json +++ b/locales/en/plugin__odf-console.json @@ -65,7 +65,6 @@ "Loading Empty Page": "Loading Empty Page", "You are not authorized to complete this action. See your cluster administrator for role-based access control information.": "You are not authorized to complete this action. See your cluster administrator for role-based access control information.", "Not Authorized": "Not Authorized", - "Alerts are displayed for both <1>ApplicationSet and <4>Subscription type applications.": "Alerts are displayed for both <1>ApplicationSet and <4>Subscription type applications.", "{{ currentStatus }} to {{ preferredCluster }}": "{{ currentStatus }} to {{ preferredCluster }}", "{{ currentStatus }} to {{ failoverCluster }}": "{{ currentStatus }} to {{ failoverCluster }}", "Unknown": "Unknown", @@ -82,7 +81,7 @@ "Operators health": "Operators health", "Peer connection": "Peer connection", " {{ peerConnectedCount }} Connected": " {{ peerConnectedCount }} Connected", - "Total applications (ApplicationSet)": "Total applications (ApplicationSet)", + "Total applications": "Total applications", " {{ protectedAppSetsCount }} protected apps": " {{ protectedAppSetsCount }} protected apps", " {{ appsWithIssues }} of {{ protectedAppSetsCount }} apps with issues": " {{ appsWithIssues }} of {{ protectedAppSetsCount }} apps with issues", "Current value: ": "Current value: ", @@ -93,19 +92,19 @@ "The graph displays the total number of block volumes inbound snapshots, by cluster, from all ApplicationSet and Subscription type applications. Applications that use file volumes are excluded in the total snapshot count.": "The graph displays the total number of block volumes inbound snapshots, by cluster, from all ApplicationSet and Subscription type applications. Applications that use file volumes are excluded in the total snapshot count.", "Block volumes replication throughput": "Block volumes replication throughput", "The graph displays the average replication throughput inbound, by cluster, from all ApplicationSet and Subscription type applications. Applications that use file volumes are excluded in the replication throughput.": "The graph displays the average replication throughput inbound, by cluster, from all ApplicationSet and Subscription type applications. Applications that use file volumes are excluded in the replication throughput.", - "Volume replication health (ApplicationSet)": "Volume replication health (ApplicationSet)", + "Volume replication health": "Volume replication health", "Volumes": "Volumes", "Cluster: {{clusterName}}": "Cluster: {{clusterName}}", "Select a cluster": "Select a cluster", "Application:": "Application:", "Namespace: ": "Namespace: ", - "Protected PVCs (ApplicationSet)": "Protected PVCs (ApplicationSet)", + "Protected PVCs": "Protected PVCs", "{{ pvcsWithIssueCount }} with issues": "{{ pvcsWithIssueCount }} with issues", "Operator status": "Operator status", "Cluster operator": "Cluster operator", "{{ healthy }} healthy": "{{ healthy }} healthy", "{{ issues }} with issues": "{{ issues }} with issues", - "The applications count displays the total number of <2>ApplicationSet type applications in all disaster recovery configured clusters.": "The applications count displays the total number of <2>ApplicationSet type applications in all disaster recovery configured clusters.", + "The applications count displays the total number of ApplicationSet and Subscription type applications in all disaster recovery configured clusters.": "The applications count displays the total number of ApplicationSet and Subscription type applications in all disaster recovery configured clusters.", "{{ protected }} protected": "{{ protected }} protected", "Systems": "Systems", "Storage System status": "Storage System status", diff --git a/packages/mco/components/mco-dashboard/data-policy/alert-card/alert-card.tsx b/packages/mco/components/mco-dashboard/data-policy/alert-card/alert-card.tsx index ee8854801..eb5a2a7b5 100644 --- a/packages/mco/components/mco-dashboard/data-policy/alert-card/alert-card.tsx +++ b/packages/mco/components/mco-dashboard/data-policy/alert-card/alert-card.tsx @@ -2,15 +2,12 @@ import * as React from 'react'; import { filterDRAlerts } from '@odf/mco/utils'; import AlertsPanel from '@odf/shared/alert/AlertsPanel'; import useAlerts from '@odf/shared/monitoring/useAlert'; -import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook'; -import { Trans } from 'react-i18next'; import { Card, CardBody } from '@patternfly/react-core'; import AlertItem from './alert-item'; import './alert-card.scss'; export const AlertsCard: React.FC = () => { const [alerts, loaded, loadError] = useAlerts(); - const { t } = useCustomTranslation(); return ( @@ -19,12 +16,6 @@ export const AlertsCard: React.FC = () => { alerts={alerts} AlertItemComponent={AlertItem} alertsFilter={filterDRAlerts} - titleToolTip={ - - Alerts are displayed for both ApplicationSet and{' '} - Subscription type applications. - - } loaded={loaded} loadError={loadError} /> diff --git a/packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster.tsx b/packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster.tsx index 7f27429c1..d5e3673d8 100644 --- a/packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster.tsx +++ b/packages/mco/components/mco-dashboard/data-policy/cluster-app-card/cluster.tsx @@ -205,7 +205,7 @@ export const ApplicationsSection: React.FC = ({ return (
{totalAppSetsCount || 0} - {t('Total applications (ApplicationSet)')} + {t('Total applications')} {t(' {{ protectedAppSetsCount }} protected apps', { protectedAppSetsCount, diff --git a/packages/mco/components/mco-dashboard/data-policy/cluster-app-card/common.tsx b/packages/mco/components/mco-dashboard/data-policy/cluster-app-card/common.tsx index f2010c68e..0f9df0969 100644 --- a/packages/mco/components/mco-dashboard/data-policy/cluster-app-card/common.tsx +++ b/packages/mco/components/mco-dashboard/data-policy/cluster-app-card/common.tsx @@ -104,9 +104,7 @@ export const VolumeSummarySection: React.FC = ({ return (
- - {t('Volume replication health (ApplicationSet)')} - + {t('Volume replication health')}
= ({ return (
{protectedPVCsCount} - {t('Protected PVCs (ApplicationSet)')} + {t('Protected PVCs')} {t('{{ pvcsWithIssueCount }} with issues', { pvcsWithIssueCount })} diff --git a/packages/mco/components/mco-dashboard/data-policy/summary-card/summary-card.tsx b/packages/mco/components/mco-dashboard/data-policy/summary-card/summary-card.tsx index d4b9c6ab6..a2f2a8c2d 100644 --- a/packages/mco/components/mco-dashboard/data-policy/summary-card/summary-card.tsx +++ b/packages/mco/components/mco-dashboard/data-policy/summary-card/summary-card.tsx @@ -109,9 +109,9 @@ export const SummaryCard: React.FC = () => { {t('Applications')} - The applications count displays the total number of{' '} - ApplicationSet type applications in all disaster - recovery configured clusters. + The applications count displays the total number of + ApplicationSet and Subscription type applications in all + disaster recovery configured clusters.