From 6ec54555796505e22855c4145b84618d001cac92 Mon Sep 17 00:00:00 2001
From: jessica <jessica@cloud.com>
Date: Wed, 25 Aug 2010 11:37:55 -0700
Subject: [PATCH] If no translation is found, return original word (i.e.
 English word)

---
 .../classes/resources/resource.properties     |  6 +----
 .../classes/resources/resource_zh.properties  | 19 +++++++++++----
 ui/new/jsp/tab_instance.jsp                   | 24 +++++++++----------
 .../com/cloud/utils/CloudResourceBundle.java  |  2 +-
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties
index b7a3baead51..0310e1c3f06 100644
--- a/client/WEB-INF/classes/resources/resource.properties
+++ b/client/WEB-INF/classes/resources/resource.properties
@@ -1,5 +1 @@
-computer = computer
-disk = disk
-computer_disk_hahaha = computer disk hahaha
-monitor = monitor
-keyboard = keyboard
+Details = Details
diff --git a/client/WEB-INF/classes/resources/resource_zh.properties b/client/WEB-INF/classes/resources/resource_zh.properties
index 948c8e13203..307334f028f 100644
--- a/client/WEB-INF/classes/resources/resource_zh.properties
+++ b/client/WEB-INF/classes/resources/resource_zh.properties
@@ -1,5 +1,14 @@
-computer = 電腦
-disk = 硬碟
-computer_disk_hahaha = 電腦 硬碟 哈哈哈 !!! 
-monitor = 瑩幕
-keyboard = 鍵盤
+Details = 詳述
+Volume = 容積
+Statistics = 統計
+Zone = 區域
+Template = 模板
+Service = 服務
+HA = 高的可用性
+Created = 產生日期
+Account = 帳戶
+Domain = 領土
+Host = 主機
+ISO = 空白模板
+
+
diff --git a/ui/new/jsp/tab_instance.jsp b/ui/new/jsp/tab_instance.jsp
index 599222ccad1..d3d2b6aeeb3 100755
--- a/ui/new/jsp/tab_instance.jsp
+++ b/ui/new/jsp/tab_instance.jsp
@@ -24,11 +24,11 @@
     </div>
     <div class="tabbox" style="margin-top:15px;">
         <div class="content_tabs on">
-            Details <%=t.t("computer")%></div>
+            <%=t.t("Details")%></div>
         <div class="content_tabs off">
-            Volume</div>
+            <%=t.t("Volume")%></div>
         <div class="content_tabs off">
-            Statistics</div>
+            <%=t.t("Statistics")%></div>
     </div>
     <div class="grid_container">
         <div class="grid_rows odd">
@@ -47,7 +47,7 @@
         <div class="grid_rows even">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    Zone:</div>
+                    <%=t.t("Zone")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
                 <div class="row_celltitles" id="zoneName">
@@ -57,7 +57,7 @@
         <div class="grid_rows odd">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    Template:</div>
+                    <%=t.t("Template")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
                 <div class="row_celltitles" id="templateName">
@@ -67,7 +67,7 @@
         <div class="grid_rows even">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    Service:</div>
+                    <%=t.t("Service")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
                 <div class="row_celltitles" id="serviceOfferingName">
@@ -77,7 +77,7 @@
         <div class="grid_rows odd">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    HA:</div>
+                    <%=t.t("HA")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
                 <div class="row_celltitles">
@@ -89,7 +89,7 @@
         <div class="grid_rows even">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    Created:</div>
+                    <%=t.t("Created")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
                 <div class="row_celltitles" id="created">
@@ -99,7 +99,7 @@
         <div class="grid_rows odd">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    Account:</div>
+                    <%=t.t("Account")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
                 <div class="row_celltitles" id="account">
@@ -109,7 +109,7 @@
         <div class="grid_rows odd">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    Domain:</div>
+                    <%=t.t("Domain")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
                 <div class="row_celltitles" id="domain">
@@ -119,7 +119,7 @@
         <div class="grid_rows even">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    Host:</div>
+                    <%=t.t("Host")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
                 <div class="row_celltitles" id="hostName">
@@ -129,7 +129,7 @@
         <div class="grid_rows odd">
             <div class="grid_row_cell" style="width: 20%;">
                 <div class="row_celltitles">
-                    ISO:</div>
+                    <%=t.t("ISO")%>:</div>
             </div>
             <div class="grid_row_cell" style="width: 79%;">
                 <div class="row_celltitles">
diff --git a/utils/src/com/cloud/utils/CloudResourceBundle.java b/utils/src/com/cloud/utils/CloudResourceBundle.java
index 146c54e50bb..69e77275928 100755
--- a/utils/src/com/cloud/utils/CloudResourceBundle.java
+++ b/utils/src/com/cloud/utils/CloudResourceBundle.java
@@ -19,7 +19,7 @@ public class CloudResourceBundle {
 		try {
 			return _bundle.getString(key);
 		} catch(Exception e) {
-			return "##" + key + "##";
+			return key; //if translation is not found, just return original word (i.e. English).
 		}
 	}