Revert "change vmname to host name"

This reverts commit 3b5460f.
zstackio · Dec 2, 2016 · 3da794f · 3da794f
1 parent 3b5460f
commit 3da794f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/zstack_dashboard/static/resources/locale-en_US.json b/zstack_dashboard/static/resources/locale-en_US.json
@@ -960,6 +960,7 @@
     "securityGroup.createSecurityGroup.DESCRIPTION": "DESCRIPTION",
     "securityGroup.createSecurityGroup.ADD RULE": "ADD RULE",
     "securityGroup.createSecurityGroup.TYPE": "TYPE",
+    "securityGroup.createSecurityGroup.START PORT": "START PORT",
     "securityGroup.createSecurityGroup.HINT1": "Not a valid port. Valid port must be in range of [1, 65535]",
     "securityGroup.createSecurityGroup.END PORT": "END PORT",
     "securityGroup.createSecurityGroup.HINT2": "Not a valid port. Valid port must be in range of [1, 65535]",

diff --git a/zstack_dashboard/static/resources/locale-zh_CN.json b/zstack_dashboard/static/resources/locale-zh_CN.json
@@ -104,7 +104,7 @@
     "vm.details.UUID": "UUID:",
     "vm.details.CPU NUM": "CPU 数量:",
     "vm.details.MEMORY SIZE": "内存大小:",
-    "vm.details.HOST NAME": "物理机名称:",
+    "vm.details.HOST NAME": "云主机名称:",
     "vm.details.INSTANCE OFFERING UUID": "计算规格 UUID:",
     "vm.details.DEFAULT L3 NETWORK UUID": "默认L3网络UUID:",
     "vm.details.IMAGE UUID": "镜像 UUID:",

diff --git a/zstack_dashboard/static/resources/locale-zh_TW.json b/zstack_dashboard/static/resources/locale-zh_TW.json
@@ -103,7 +103,7 @@
     "vm.details.UUID": "UUID:",
     "vm.details.CPU NUM": "CPU 數量:",
     "vm.details.MEMORY SIZE": "記憶體大小:",
-    "vm.details.HOST NAME": "物理機名稱:",
+    "vm.details.HOST NAME": "雲主機名稱:",
     "vm.details.INSTANCE OFFERING UUID": "雲主機規格UUID:",
     "vm.details.DEFAULT L3 NETWORK UUID": "預設L3 網路UUID:",
     "vm.details.IMAGE UUID": "映像檔 UUID:",

diff --git a/zstack_dashboard/static/templates/vm/details.html b/zstack_dashboard/static/templates/vm/details.html
@@ -90,7 +90,7 @@ <h1>{{model.current.name}}</h1>
                 <td><span>{{model.current.cpuNum}}</span></td>
               </tr>
               <tr>
-                <td><span class="z-label">{{"vm.details.MEMORY SIZE" | translate}}</span></td>
+                <td><span class="z-label">{{"vm.details.MEMORY SIZE" | translate}}:</span></td>
                 <td><span>{{model.current.memorySize | size}}</span></td>
               </tr>
               <tr>