Merge pull request openshift#8782 from rhamilto/bz1941798

Bug 1941798: i18n kind on LimitRange and ResourceQuota list pages
christianaranda · Apr 27, 2021 · 3ea5bb0 · 3ea5bb0
2 parents 03575ec + c96874c
commit 3ea5bb0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/frontend/public/components/limit-range.tsx b/frontend/public/components/limit-range.tsx
@@ -97,13 +97,7 @@ export const LimitRangeList: React.FC = (props) => {
 };
 
 export const LimitRangeListPage: React.FC<LimitRangeListPageProps> = (props) => (
- <ListPage
- {...props}
- title={LimitRangeModel.labelPlural}
- kind={LimitRangeReference}
- ListComponent={LimitRangeList}
- canCreate={true}
- />
+ <ListPage {...props} kind={LimitRangeReference} ListComponent={LimitRangeList} canCreate={true} />
 );
 
 export const LimitRangeDetailsRow: React.SFC<LimitRangeDetailsRowProps> = ({

diff --git a/frontend/public/components/resource-quota.jsx b/frontend/public/components/resource-quota.jsx
@@ -443,16 +443,14 @@ export const ResourceQuotasPage = connectToFlags(FLAGS.OPENSHIFT)(
  <MultiListPage
  canCreate={true}
  createAccessReview={accessReview}
- createButtonText={t('resource-quota~Create {{resource}}', {
- resource: ResourceQuotaModel.label,
- })}
+ createButtonText={t('resource-quota~Create ResourceQuota')}
  createProps={{ to: `/k8s/ns/${createNS}/resourcequotas/~new` }}
  ListComponent={ResourceQuotasList}
  resources={resources}
- label={ResourceQuotaModel.labelPlural}
+ label={t(ResourceQuotaModel.labelPluralKey)}
  namespace={namespace}
  flatten={flatten}
- title={ResourceQuotaModel.labelPlural}
+ title={t(ResourceQuotaModel.labelPluralKey)}
  rowFilters={rowFilters}
  mock={mock}
  showTitle={showTitle}

diff --git a/frontend/public/locales/en/resource-quota.json b/frontend/public/locales/en/resource-quota.json
@@ -23,5 +23,5 @@
  "Role": "Role",
  "Cluster-wide {{resource}}": "Cluster-wide {{resource}}",
  "Namespace {{resource}}": "Namespace {{resource}}",
- "Create {{resource}}": "Create {{resource}}"
+ "Create ResourceQuota": "Create ResourceQuota"
 }