Fix the issue that cluster driver name is incorrect

https://github.com/rancher/rancher/issues/18208
This commit is contained in:
loganhz 2019-02-18 13:49:48 +08:00
parent 6a812e5576
commit f943ff65fe
3 changed files with 12 additions and 10 deletions

View File

@ -30,10 +30,13 @@ var KontainerDriver = Resource.extend({
displayName: computed('name', 'intl.locale', function() {
const intl = get(this, 'intl');
const name = get(this, 'name');
const key = `kontainerDriver.displayName.${ name }`;
const keyByName = `kontainerDriver.displayName.${ name }`;
const keyById = `kontainerDriver.displayName.${ get(this, 'id') }`;
if ( name && intl.exists(key) ) {
return intl.t(key);
if ( name && intl.exists(keyByName) ) {
return intl.t(keyByName);
} if ( intl.exists(keyById) ) {
return intl.t(keyById);
} else if ( name ) {
return name.capitalize();
} else {

View File

@ -5873,14 +5873,14 @@ clusterDrivers:
kontainerDriver:
displayName:
aliyun: Aliyun
aliyunkubernetescontainerservice: Alibaba ACK
amazonElasticContainerService: Amazon ECS
azureKubernetesService: Azure AKS
googleKubernetesEngine: Google GKE
huawei: Huawei
huaweicontainercloudengine: Huawei CCE
import: Import
rancherKubernetesEngine: Rancher RKE
tencent: Tencent
tencentkubernetesengine: Tencent TKE
nodeDriver:

View File

@ -5839,15 +5839,14 @@ clusterDrivers:
kontainerDriver:
displayName:
aliyun: Aliyun
aliyunkubernetescontainerservice: 阿里云ACK
amazonElasticContainerService: Amazon ECS
azureKubernetesService: Azure AKS
googleKubernetesEngine: Google GKE
huawei: Huawei
huaweicontainercloudengine: 华为CCE
import: Import
rancherKubernetesEngine: Rancher RKE
tencent: Tencent
tencentkubernetesengine: 腾讯TKE
nodeDriver:
addTemplate: 添加主机模板