From 843f04ccfb334bdedcb7e6695c016972f18b700c Mon Sep 17 00:00:00 2001
From: n313893254 <n313893254@126.com>
Date: Thu, 14 Feb 2019 15:57:13 +0800
Subject: [PATCH] GKE cluster: Additional Zones should be labeled correctly in
 the UI https://github.com/rancher/rancher/issues/18072

---
 app/styles/base/_helpers.scss                             | 4 ++++
 .../cluster-driver/driver-googlegke/template.hbs          | 2 +-
 translations/en-us.yaml                                   | 4 ++--
 translations/zh-hans.yaml                                 | 8 +++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/styles/base/_helpers.scss b/app/styles/base/_helpers.scss
index f1e8a1b66..0b9074411 100755
--- a/app/styles/base/_helpers.scss
+++ b/app/styles/base/_helpers.scss
@@ -306,4 +306,8 @@ a.disabled {
   top: 0px;
   display:inline-block;
   vertical-align: top;
+}
+
+.select-algin-checkbox {
+  margin-top: 3px;
 }
\ No newline at end of file
diff --git a/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs b/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs
index aa266346b..6498a234b 100644
--- a/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs
+++ b/lib/shared/addon/components/cluster-driver/driver-googlegke/template.hbs
@@ -48,7 +48,7 @@
             {{config.zone}}
           {{else}}
             {{new-select
-                classNames="form-control"
+                classNames="form-control select-algin-checkbox"
                 optionValuePath="name"
                 optionLabelPath="name"
                 content=zoneChoices
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 8b3d9522d..1560cd789 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -2506,7 +2506,7 @@ clusterNew:
       label: Private Nodes
     masterIpv4CidrBlock:
       label: Master Ipv4 CIDR Block
-      placeholder: e.g. 10.42.0.0/42
+      placeholder: e.g. 10.42.0.0/24
     useIpAliases:
       label: Use Ip Aliases
     ipPolicySubnetworkName:
@@ -2540,7 +2540,7 @@ clusterNew:
       nodePoolAutoscaling: Node Pool Autoscaling
       masterAuthorizedNetwork: Master Authorized Network
     locations:
-      label: Locations
+      label: Additional Zones
     imageType:
       label: Image Type
       UBUNTU: Ubuntu
diff --git a/translations/zh-hans.yaml b/translations/zh-hans.yaml
index f609424ca..fb6b4d83e 100644
--- a/translations/zh-hans.yaml
+++ b/translations/zh-hans.yaml
@@ -2273,7 +2273,7 @@ clusterNew:
       label: 私有节点
     masterIpv4CidrBlock:
       label: 主节点 Ipv4 CIDR Block
-      placeholder: e.g. 10.42.0.0
+      placeholder: '例如: 10.42.0.0/24'
     useIpAliases:
       label: 使用别名IP
     ipPolicySubnetworkName:
@@ -2289,7 +2289,7 @@ clusterNew:
       placeholder: Your Services Secondary Range Name
     ipPolicyClusterIpv4CidrBlock:
       label: Pod地址范围
-      placeholder: e.g. 10.0.0.0/18
+      placeholder: '例如: 10.0.0.0/18'
     ipPolicyNodeIpv4CidrBlock:
       label: Node Ipv4 CIDR Block
       placeholder: Your Node Ipv4 CIDR Block
@@ -2299,7 +2299,7 @@ clusterNew:
       addActionLabel: Add CIDR Block
     ipPolicyServicesIpv4CidrBlock:
       label: 服务地址范围
-      placeholder: e.g. 10.94.0.0/18
+      placeholder: '例如: 10.94.0.0/18'
     network:
       label: 网络
     subNetwork:
@@ -2381,6 +2381,8 @@ clusterNew:
       label: Cloud Source Repositories
     cloudDebugger:
       label: Cloud Debugger
+    locations:
+      label: 其他节点位置
     header:
       iPAllocationPolicy: IP Allocation策略
       privateCluster: 私有集群