From fc9a4f66ca9ced56efc51ce84bd78aea0736ad9d Mon Sep 17 00:00:00 2001 From: vetrivelc Date: Wed, 15 Oct 2014 18:18:51 +0530 Subject: [PATCH] CLOUDSTACK-8094: Fixed incorrect label issue. (cherry picked from commit 4e1284147e0f5489c25d275dd047854d17002691) Signed-off-by: Rohit Yadav Conflicts: ui/dictionary2.jsp --- client/WEB-INF/classes/resources/messages.properties | 4 +++- client/WEB-INF/classes/resources/messages_fr_FR.properties | 3 ++- client/WEB-INF/classes/resources/messages_ja_JP.properties | 2 ++ client/WEB-INF/classes/resources/messages_zh_CN.properties | 2 ++ ui/dictionary.jsp | 2 +- ui/dictionary2.jsp | 1 + ui/scripts/zoneWizard.js | 2 +- 7 files changed, 12 insertions(+), 4 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 71721f6192d..6ee65955301 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -833,7 +833,8 @@ label.migrate.router.to=Migrate Router to label.migrate.systemvm.to=Migrate System VM to label.migrate.to.host=Migrate to host label.migrate.to.storage=Migrate to storage -label.migrate.volume=Migrate volume to another primary storage +label.migrate.volume=Migrate Volume +label.migrate.volume.to.primary.storage=Migrate volume to another primary storage label.minimum=Minimum label.minute.past.hour=minute(s) Past the Hour label.monday=Monday @@ -2056,3 +2057,4 @@ state.Stopping=Stopping state.Suspended=Suspended ui.listView.filters.all=All ui.listView.filters.mine=Mine +label.na=NA \ No newline at end of file diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties index f6a7a955f43..9ba5f1d43cf 100644 --- a/client/WEB-INF/classes/resources/messages_fr_FR.properties +++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties @@ -960,7 +960,8 @@ label.migrate.router.to=Migrer le routeur vers label.migrate.systemvm.to=Migrer la VM syst\u00e8me vers label.migrate.to.host=Migrer vers un h\u00f4te label.migrate.to.storage=Migrer vers un stockage -label.migrate.volume=Migration du volume vers un autre stockage primaire +label.migrate.volume=Migration du volume +label.migrate.volume.to.primary.storage=Migration du volume vers un autre stockage primaire label.minimum=Minimum label.min.instances=Instances Min. label.minute.past.hour=minute(s) diff --git a/client/WEB-INF/classes/resources/messages_ja_JP.properties b/client/WEB-INF/classes/resources/messages_ja_JP.properties index 7a00ab70dab..d2d6518bc27 100644 --- a/client/WEB-INF/classes/resources/messages_ja_JP.properties +++ b/client/WEB-INF/classes/resources/messages_ja_JP.properties @@ -960,6 +960,8 @@ label.migrate.router.to=\u30eb\u30fc\u30bf\u30fc\u306e\u79fb\u884c\u5148\: label.migrate.systemvm.to=\u30b7\u30b9\u30c6\u30e0 VM \u306e\u79fb\u884c\u5148\: label.migrate.to.host=\u30db\u30b9\u30c8\u3078\u79fb\u884c label.migrate.to.storage=\u30b9\u30c8\u30ec\u30fc\u30b8\u3078\u79fb\u884c +label.migrate.volume=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u79fb\u884c +label.migrate.volume.to.primary.storage=\u5225\u306e\u30d7\u30e9\u30a4\u30de\u30ea \u30b9\u30c8\u30ec\u30fc\u30b8\u3078\u306e\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u79fb\u884c label.minimum=\u6700\u5c0f label.min.instances=\u6700\u5c0f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u6570 label.minute.past.hour=\u5206 (\u6bce\u6642) diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index 289c3a8c9ed..f872778b89c 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -960,6 +960,8 @@ label.migrate.router.to=\u8fc1\u79fb\u8def\u7531\u5668\u81f3 label.migrate.systemvm.to=\u8fc1\u79fb\u7cfb\u7edf VM \u81f3 label.migrate.to.host=\u8fc1\u79fb\u5230\u4e3b\u673a label.migrate.to.storage=\u8fc1\u79fb\u5230\u5b58\u50a8 +label.migrate.volume=\u8fc1\u79fb\u5377 +label.migrate.volume.to.primary.storage=\u5c06\u5377\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u5b58\u50a8 label.minimum=\u6700\u5c0f\u503c label.min.instances=\u6700\u5c0f\u5b9e\u4f8b\u6570 label.minute.past.hour=\u5206 diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index c7599ed1c40..9c0fd55e00b 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -835,7 +835,7 @@ dictionary = { 'label.migrate.systemvm.to': '', 'label.migrate.to.host': '', 'label.migrate.to.storage': '', -'label.migrate.volume': '', +'label.migrate.volume.to.primary.storage': '', 'label.minimum': '', 'label.minute.past.hour': '', 'label.monday': '', diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp index df0e18c8578..862468e3df5 100644 --- a/ui/dictionary2.jsp +++ b/ui/dictionary2.jsp @@ -711,6 +711,7 @@ $.extend(dictionary, { 'label.start.lb.vm': '', 'label.stop.lb.vm': '', 'label.migrate.lb.vm': '', +'label.migrate.volume': '', 'label.vpc.virtual.router': '', 'label.ovs': '', 'label.gslb.service': '', diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 66b34699eb0..700904d8a50 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -1638,7 +1638,7 @@ $form.find('[rel=server]').find(".value").find("input").val("localhost"); $form.find('[rel=path]').css('display', 'block'); - $form.find('[rel=path]').find(".name").find("label").html("*'label.SR.name':"); + $form.find('[rel=path]').find(".name").find("label").html('*'+_l('label.SR.name')+':'); $form.find('[rel=smbUsername]').hide(); $form.find('[rel=smbPassword]').hide();