From 306efdf2aa4653f028c181dad0dcf2ea2471f717 Mon Sep 17 00:00:00 2001
From: QiRaining <804470533@qq.com>
Date: Mon, 24 Oct 2016 17:13:50 +0800
Subject: [PATCH] [FIX]i118 error

---
 zstack_dashboard/static/resources/locale-zh_CN.json             | 2 +-
 zstack_dashboard/static/resources/locale-zh_TW.json             | 2 +-
 .../static/templates/volume/createTemplateFromVolume.html       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zstack_dashboard/static/resources/locale-zh_CN.json b/zstack_dashboard/static/resources/locale-zh_CN.json
index fb4d4e6..1a66632 100755
--- a/zstack_dashboard/static/resources/locale-zh_CN.json
+++ b/zstack_dashboard/static/resources/locale-zh_CN.json
@@ -594,7 +594,7 @@
     "volume.createTemplateFromVolume.ALERT1.3": "创建新的备份存储",
     "volume.createTemplateFromVolume.CREATE TEMPLATE FROM ROOT VOLUME": "从根云盘添加镜像",
     "volume.createTemplateFromVolume.ALERT2.1": "云主机",
-    "volume.createTemplateFromVolume.ALERT2.2": "是在运行状态的",
+    "volume.createTemplateFromVolume.ALERT2.2": "的状态是",
     "volume.createTemplateFromVolume.ALERT2.3": "只有云主机处于停止状态时,才可添加模板",
     "volume.createTemplateFromVolume.BACKUP STORAGE": "备份存储",
     "volume.createTemplateFromVolume.NAME": "名称",
diff --git a/zstack_dashboard/static/resources/locale-zh_TW.json b/zstack_dashboard/static/resources/locale-zh_TW.json
index 110997d..1cb568d 100755
--- a/zstack_dashboard/static/resources/locale-zh_TW.json
+++ b/zstack_dashboard/static/resources/locale-zh_TW.json
@@ -594,7 +594,7 @@
     "volume.createTemplateFromVolume.ALERT1.3": "要新增一個新",
     "volume.createTemplateFromVolume.CREATE TEMPLATE FROM ROOT VOLUME": "從根雲磁碟新增映像檔",
     "volume.createTemplateFromVolume.ALERT2.1": "雲主機",
-    "volume.createTemplateFromVolume.ALERT2.2": "是在運行狀態的",
+    "volume.createTemplateFromVolume.ALERT2.2": "的狀態是",
     "volume.createTemplateFromVolume.ALERT2.3": "只當云主機處於停止狀態時,可以新增模板",
     "volume.createTemplateFromVolume.BACKUP STORAGE": "備份儲存",
     "volume.createTemplateFromVolume.NAME": "名稱",
diff --git a/zstack_dashboard/static/templates/volume/createTemplateFromVolume.html b/zstack_dashboard/static/templates/volume/createTemplateFromVolume.html
index cc4fb81..45b7fbb 100755
--- a/zstack_dashboard/static/templates/volume/createTemplateFromVolume.html
+++ b/zstack_dashboard/static/templates/volume/createTemplateFromVolume.html
@@ -7,7 +7,7 @@
 
         <h4 class="z-win-h4">{{ "volume.createTemplateFromVolume.CREATE TEMPLATE FROM ROOT VOLUME" | translate }}</h4>
         <div class="alert alert-warning col-sm-21" ng-show="!isVmInCorrectState()">
-            {{ "volume.createTemplateFromVolume.ALERT2.1" | translate }}<a herf="/#/vmInstance/{{vm.uuid}}">{{vm.name}}</a>{{ "volume.createTemplateFromVolume.ALERT2.2" | translate }}{{vm.state}}{{ "volume.createTemplateFromVolume.ALERT2.3" | translate }}
+            {{ "volume.createTemplateFromVolume.ALERT2.1" | translate }}<a herf="/#/vmInstance/{{vm.uuid}}">{{vm.name}}</a>{{ "volume.createTemplateFromVolume.ALERT2.2" | translate }}{{vm.state}},{{ "volume.createTemplateFromVolume.ALERT2.3" | translate }}
             
         </div>
         <form class="form">