diff --git a/frontend/public/components/hpa.tsx b/frontend/public/components/hpa.tsx index 197d569f319..4cbc09d7150 100644 --- a/frontend/public/components/hpa.tsx +++ b/frontend/public/components/hpa.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import * as _ from 'lodash-es'; import * as classNames from 'classnames'; import { sortable } from '@patternfly/react-table'; -import { useTranslation } from 'react-i18next'; +import { Trans, useTranslation } from 'react-i18next'; import { K8sResourceKind, K8sResourceKindReference, @@ -95,16 +95,17 @@ const MetricsTable: React.FC = ({ obj: hpa }) => { const objectRow = (metric, current, ns, key, scaleTarget) => { const { object } = metric; + const name = object.metric.name; const type = ( - <> - {object.metric.name} {t('public~on')} + + {{ name }} on - + ); const currentValue = current?.object?.current.value; const targetValue = object.target.value; diff --git a/frontend/public/locales/en/public.json b/frontend/public/locales/en/public.json index c5eaba24816..247da868429 100644 --- a/frontend/public/locales/en/public.json +++ b/frontend/public/locales/en/public.json @@ -156,7 +156,7 @@ "resource {{name}}": "resource {{name}}", "(as a percentage of request)": "(as a percentage of request)", "{{name}} on pods": "{{name}} on pods", - "on": "on", + "{{name}} on<2>": "{{name}} on<2>", "Metrics": "Metrics", "Current": "Current", "Target": "Target", @@ -676,8 +676,6 @@ "LocalResourceAccessReview": "LocalResourceAccessReview", "LocalResourceAccessReviews": "LocalResourceAccessReviews", "PersistentVolume": "PersistentVolume", - "Petset": "Petset", - "Petsets": "Petsets", "StatefulSet": "StatefulSet", "ResourceQuota": "ResourceQuota", "ClusterResourceQuota": "ClusterResourceQuota", diff --git a/frontend/public/models/index.ts b/frontend/public/models/index.ts index db4605f9ee9..2fbd241bbaf 100644 --- a/frontend/public/models/index.ts +++ b/frontend/public/models/index.ts @@ -675,21 +675,6 @@ export const PersistentVolumeClaimModel: K8sKind = { labelPluralKey: 'public~PersistentVolumeClaims', }; -export const PetsetModel: K8sKind = { - apiVersion: 'v1', - label: 'Petset', - // t('public~Petset') - labelKey: 'public~Petset', - plural: 'petsets', - abbr: 'PS', - propagationPolicy: 'Foreground', - kind: 'Petset', - id: 'petset', - labelPlural: 'Petsets', - // t('public~Petsets') - labelPluralKey: 'public~Petsets', -}; - export const StatefulSetModel: K8sKind = { label: 'StatefulSet', // t('public~StatefulSet')