From c05a040c5670b7c0d8fc0f4d460c109eb367b509 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 16 Feb 2012 15:35:44 -0800
Subject: [PATCH] cloudstack 3.0 new UI - add more localization labels.

---
 client/WEB-INF/classes/resources/messages.properties |  2 +-
 .../WEB-INF/classes/resources/messages_ja.properties |  2 +-
 ui/index.jsp                                         |  2 +-
 ui/scripts/system.js                                 | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 5f97b23f5a0..52b4f4f2196 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -318,7 +318,7 @@ label.action.unmanage.cluster=Unmanage Cluster
 message.action.unmanage.cluster=Please confirm that you want to unmanage the cluster.
 label.action.unmanage.cluster.processing=Unmanaging Cluster....
 
-allocation.state=Allocation State
+label.allocation.state=Allocation State
 managed.state=Managed State
 
 label.default.use=Default Use
diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties
index 67554d26890..7be615649bb 100644
--- a/client/WEB-INF/classes/resources/messages_ja.properties
+++ b/client/WEB-INF/classes/resources/messages_ja.properties
@@ -317,7 +317,7 @@ label.action.unmanage.cluster=非管理対象クラスタ
 message.action.unmanage.cluster=クラスタを非管理対象にしてもよろしいですか?
 label.action.unmanage.cluster.processing=クラスタを非管理対象にしています....
 
-allocation.state=アロケーション状態
+label.allocation.state=アロケーション状態
 managed.state=管理された状態
 
 label.default.use=デフォルト使用
diff --git a/ui/index.jsp b/ui/index.jsp
index a382c1a44e6..cfa90e626eb 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1915,7 +1915,7 @@ dictionary = {
 'label.action.unmanage.cluster': '<fmt:message key="label.action.unmanage.cluster" />',
 'message.action.unmanage.cluster': '<fmt:message key="message.action.unmanage.cluster" />',
 'label.action.unmanage.cluster.processing': '<fmt:message key="label.action.unmanage.cluster.processing" />',
-'allocation.state': '<fmt:message key="allocation.state" />',
+'label.allocation.state': '<fmt:message key="label.allocation.state" />',
 'managed.state': '<fmt:message key="managed.state" />',
 'label.default.use': '<fmt:message key="label.default.use" />',
 'label.host.tags': '<fmt:message key="label.host.tags" />',
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 9b127f54d3e..10384aea57a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -3043,7 +3043,7 @@
                 }
               },
               allocationstate: {
-                label: 'allocation.state',
+                label: 'label.allocation.state',
                 converter: function(str) {
                   // For localization
                   return str;
@@ -3301,7 +3301,7 @@
                     },
                     {
                       id: { label: 'label.id' },
-                      allocationstate: { label: 'allocation.state' },
+                      allocationstate: { label: 'label.allocation.state' },
                       dns1: { label: 'label.dns.1', isEditable: true },
                       dns2: { label: 'label.dns.2', isEditable: true },
                       internaldns1: { label: 'label.internal.dns.1', isEditable: true },
@@ -4291,7 +4291,7 @@
                 // For localization
                 return str;
               },
-              label: 'allocation.state'
+              label: 'label.allocation.state'
             }
           },
 
@@ -4542,7 +4542,7 @@
                         // For localization
                         return str;
                       },
-                      label: 'allocation.state'
+                      label: 'label.allocation.state'
                     }
                   }
                 ],
@@ -4591,7 +4591,7 @@
             name: { label: 'label.name' },
             podname: { label: 'label.pod' },
             hypervisortype: { label: 'label.hypervisor' },
-            //allocationstate: { label: 'allocation.state' },
+            //allocationstate: { label: 'label.allocation.state' },
             //managedstate: { label: 'Managed State' },
 						state: {
               converter: function(str) {
@@ -4969,7 +4969,7 @@
                     podname: { label: 'label.pod' },
                     hypervisortype: { label: 'label.hypervisor' },
                     clustertype: { label: 'label.cluster.type' },
-                    //allocationstate: { label: 'allocation.state' },
+                    //allocationstate: { label: 'label.allocation.state' },
                     //managedstate: { label: 'Managed State' },
 										state: { label: 'label.state' }
                   }