Skip to content

Commit 5a3b384

Browse files
Translation strings for health status in export (stolostron#4260)
* translation strings for health status in export Signed-off-by: Randy Bruno Piverger <rbrunopi@redhat.com> * Update base image for CVEs Signed-off-by: Kevin Cormier <kcormier@redhat.com> --------- Signed-off-by: Randy Bruno Piverger <rbrunopi@redhat.com> Signed-off-by: Kevin Cormier <kcormier@redhat.com> Co-authored-by: Kevin Cormier <kcormier@redhat.com>
1 parent 57ef572 commit 5a3b384

File tree

6 files changed

+22
-14
lines changed

6 files changed

+22
-14
lines changed

Containerfile.acm.konflux

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN cd frontend && npm run build:plugin:acm
1616
# Remove build-time dependencies before packaging
1717
RUN cd backend && npm ci --omit=optional --only=production --unsafe-perm
1818

19-
FROM brew.registry.redhat.io/rh-osbs/rhacm2-nodejs-parent:v2.10.0_20-40
19+
FROM brew.registry.redhat.io/rh-osbs/rhacm2-nodejs-parent:v2.10.0_20-42
2020

2121
WORKDIR /app
2222
ENV NODE_ENV production

Containerfile.mce.konflux

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN cd frontend && npm run build:plugin:mce
1616
# Remove build-time dependencies before packaging
1717
RUN cd backend && npm ci --omit=optional --only=production --unsafe-perm
1818

19-
FROM brew.registry.redhat.io/rh-osbs/rhacm2-nodejs-parent:v2.10.0_20-40
19+
FROM brew.registry.redhat.io/rh-osbs/rhacm2-nodejs-parent:v2.10.0_20-42
2020

2121
WORKDIR /app
2222
ENV NODE_ENV production

frontend/public/locales/en/translation.json

+8
Original file line numberDiff line numberDiff line change
@@ -1077,6 +1077,7 @@
10771077
"Currently, search is disabled on some of your managed clusters. Some data might be missing from the console view.": "Currently, search is disabled on some of your managed clusters. Some data might be missing from the console view.",
10781078
"Currently, search is disabled on some of your managed clusters. Some data might be missing from the topology view.": "Currently, search is disabled on some of your managed clusters. Some data might be missing from the topology view.",
10791079
"D2 - Up to 48 TB of HDD-based local storage": "D2 - Up to 48 TB of HDD-based local storage",
1080+
"danger": "danger",
10801081
"Date and time of the most recent reconcile for application resources.": "Date and time of the most recent reconcile for application resources.",
10811082
"Date and time of the most recent sync request for application resources.": "Date and time of the most recent sync request for application resources.",
10821083
"Dav4-series": "Dav4-series",
@@ -1158,6 +1159,7 @@
11581159
"destroying.success": "{{clusterName}} was successfully destroyed",
11591160
"destroying.success.message": "{{clusterName}} was successfully destroyed. Select <bold>Back to clusters</bold> or create a new cluster.",
11601161
"detach": "Detach",
1162+
"detached": "detached",
11611163
"detaching": "Detaching",
11621164
"detaching.inprogress": "{{clusterName}} is being detached",
11631165
"detaching.inprogress.message": "It might take a few minutes for the detach process to complete. Select <bold>Back to clusters</bold> or wait here.",
@@ -1499,6 +1501,7 @@
14991501
"Health status": "Health status",
15001502
"Health Status": "Health Status",
15011503
"Health status for ArgoCD applications.": "Health status for ArgoCD applications.",
1504+
"healthy": "healthy",
15021505
"Healthy": "Healthy",
15031506
"Helm": "Helm",
15041507
"Help us improve Red Hat Advanced Cluster Management for Kubernetes.": "Help us improve Red Hat Advanced Cluster Management for Kubernetes.",
@@ -1629,6 +1632,7 @@
16291632
"Imported clusters cannot be destroyed.": "Imported clusters cannot be destroyed.",
16301633
"importing": "Importing",
16311634
"Importing": "Importing",
1635+
"in progress": "in progress",
16321636
"Inapplicable": "Inapplicable",
16331637
"Include namespaces": "Include namespaces",
16341638
"Increased resiliency with closely interconnected control plane and worker nodes.": "Increased resiliency with closely interconnected control plane and worker nodes.",
@@ -2233,6 +2237,7 @@
22332237
"Processor type": "Processor type",
22342238
"Production environments can deny direct access to the Internet and instead have an HTTP or HTTPS proxy available. You can configure a new OpenShift Container Platform cluster to use a proxy by configuring the proxy settings.": "Production environments can deny direct access to the Internet and instead have an HTTP or HTTPS proxy available. You can configure a new OpenShift Container Platform cluster to use a proxy by configuring the proxy settings.",
22352239
"Profiles": "Profiles",
2240+
"progress": "progress",
22362241
"Progressing": "Progressing",
22372242
"Project ID": "Project ID",
22382243
"prop.details.section": "Details",
@@ -2367,6 +2372,7 @@
23672372
"Run an OpenShift cluster where the control plane and data plane are coupled. The control plane is hosted by a dedicated group of physical or virtual nodes and the network stack is shared.": "Run an OpenShift cluster where the control plane and data plane are coupled. The control plane is hosted by a dedicated group of physical or virtual nodes and the network stack is shared.",
23682373
"Run an OpenShift cluster where the control plane is decoupled from the data plane, and is treated like a multi-tenant workload on a hosting service cluster. The data plane is on a separate network domain that allows segmentation between management and workload traffic.": "Run an OpenShift cluster where the control plane is decoupled from the data plane, and is treated like a multi-tenant workload on a hosting service cluster. The data plane is on a separate network domain that allows segmentation between management and workload traffic.",
23692374
"Run command": "Run command",
2375+
"running": "running",
23702376
"S3 Bucket": "S3 Bucket",
23712377
"save": "Save",
23722378
"Save": "Save",
@@ -2492,6 +2498,7 @@
24922498
"Single replica means components are not expected to be resilient to problems across most fault boundaries associated with high availability. This usually means running critical workloads with just 1 replica and with toleration of full disruption of the component.": "Single replica means components are not expected to be resilient to problems across most fault boundaries associated with high availability. This usually means running critical workloads with just 1 replica and with toleration of full disruption of the component.",
24932499
"Size (GiB)": "Size (GiB)",
24942500
"Skip tags": "Skip tags",
2501+
"sleep": "sleep",
24952502
"Some policies have the Prune parameter set.": "Some policies have the Prune parameter set.",
24962503
"Some resources failed to deploy. Use View resource YAML link to view the details.": "Some resources failed to deploy. Use View resource YAML link to view the details.",
24972504
"Some resources failed to deploy. Use View status YAML link to view the details.": "Some resources failed to deploy. Use View status YAML link to view the details.",
@@ -3311,6 +3318,7 @@
33113318
"vSphere resource pool": "vSphere resource pool",
33123319
"Want more information? Check out the developer community.": "Want more information? Check out the developer community.",
33133320
"Want to learn more?": "Want to learn more?",
3321+
"warning": "warning",
33143322
"Warning": "Warning",
33153323
"Warning:": "Warning:",
33163324
"Web console": "Web console",

frontend/src/routes/Infrastructure/Clusters/ClusterPools/ClusterPools.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,11 @@ export function ClusterPoolsTable(props: {
370370

371371
if (clusterStatusAvailable) {
372372
return (
373-
`healthy: ${status?.healthy}, running: ${status?.running}, ` +
374-
`warning: ${status?.warning}, progress: ${status?.progress}, ` +
375-
`danger: ${status?.danger}, detached: ${status?.detached}, ` +
376-
`pending: ${status?.pending}, sleep: ${status?.sleep}, ` +
377-
`unknown: ${status?.unknown}`
373+
`${t('healthy')}: ${status?.healthy}, ${t('running')}: ${status?.running}, ` +
374+
`${t('warning')}: ${status?.warning}, ${t('progress')}: ${status?.progress}, ` +
375+
`${t('danger')}: ${status?.danger}, ${t('detached')}: ${status?.detached}, ` +
376+
`${t('pending')}: ${status?.pending}, ${t('sleep')}: ${status?.sleep}, ` +
377+
`${t('unknown')}: ${status?.unknown}`
378378
)
379379
}
380380
}

frontend/src/routes/Infrastructure/Clusters/ClusterSets/ClusterSets.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,11 @@ export function ClusterSetsTable(props: { managedClusterSets?: ManagedClusterSet
246246

247247
if (clusterStatusAvailable)
248248
return (
249-
`healthy: ${status?.healthy}, running: ${status?.running}, ` +
250-
`warning: ${status?.warning}, progress: ${status?.progress}, ` +
251-
`danger: ${status?.danger}, detached: ${status?.detached}, ` +
252-
`pending: ${status?.pending}, sleep: ${status?.sleep}, ` +
253-
`unknown: ${status?.unknown}`
249+
`${t('healthy')}: ${status?.healthy}, ${t('running')}: ${status?.running}, ` +
250+
`${t('warning')}: ${status?.warning}, ${t('progress')}: ${status?.progress}, ` +
251+
`${t('danger')}: ${status?.danger}, ${t('detached')}: ${status?.detached}, ` +
252+
`${t('pending')}: ${status?.pending}, ${t('sleep')}: ${status?.sleep}, ` +
253+
`${t('unknown')}: ${status?.unknown}`
254254
)
255255
},
256256
},

frontend/src/routes/Infrastructure/Clusters/ManagedClusters/ManagedClusters.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ export function useClusterNodesColumn(): IAcmTableColumn<Cluster> {
950950
)
951951
},
952952
exportContent: (cluster) => {
953-
return `healthy: ${cluster.nodes!.ready}, danger: ${cluster.nodes!.unhealthy}, unknown: ${cluster.nodes!.unknown}`
953+
return `${t('healthy')}: ${cluster.nodes!.ready}, ${t('danger')}: ${cluster.nodes!.unhealthy}, ${t('unknown')}: ${cluster.nodes!.unknown}`
954954
},
955955
}
956956
}
@@ -974,7 +974,7 @@ export function useClusterAddonColumn(): IAcmTableColumn<Cluster> {
974974
)
975975
},
976976
exportContent: (cluster) => {
977-
return `healthy: ${cluster.addons!.available}, danger: ${cluster.addons!.degraded}, in progress: ${cluster.addons!.progressing}, unknown: ${cluster.addons!.unknown}`
977+
return `${t('healthy')}: ${cluster.addons!.available}, ${t('danger')}: ${cluster.addons!.degraded}, ${t('in progress')}: ${cluster.addons!.progressing}, ${t('unknown')}: ${cluster.addons!.unknown}`
978978
},
979979
}
980980
}

0 commit comments

Comments
 (0)