Skip to content

Commit fc9a4f6

Browse files
vetrivelcyadvr
vetrivelc
authored and
yadvr
committed
CLOUDSTACK-8094: Fixed incorrect label issue.
(cherry picked from commit 4e12841) Signed-off-by: Rohit Yadav <[email protected]> Conflicts: ui/dictionary2.jsp
1 parent 9e82365 commit fc9a4f6

7 files changed

Lines changed: 12 additions & 4 deletions

File tree

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,8 @@ label.migrate.router.to=Migrate Router to
833833
label.migrate.systemvm.to=Migrate System VM to
834834
label.migrate.to.host=Migrate to host
835835
label.migrate.to.storage=Migrate to storage
836-
label.migrate.volume=Migrate volume to another primary storage
836+
label.migrate.volume=Migrate Volume
837+
label.migrate.volume.to.primary.storage=Migrate volume to another primary storage
837838
label.minimum=Minimum
838839
label.minute.past.hour=minute(s) Past the Hour
839840
label.monday=Monday
@@ -2056,3 +2057,4 @@ state.Stopping=Stopping
20562057
state.Suspended=Suspended
20572058
ui.listView.filters.all=All
20582059
ui.listView.filters.mine=Mine
2060+
label.na=NA

‎client/WEB-INF/classes/resources/messages_fr_FR.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,8 @@ label.migrate.router.to=Migrer le routeur vers
960960
label.migrate.systemvm.to=Migrer la VM syst\u00e8me vers
961961
label.migrate.to.host=Migrer vers un h\u00f4te
962962
label.migrate.to.storage=Migrer vers un stockage
963-
label.migrate.volume=Migration du volume vers un autre stockage primaire
963+
label.migrate.volume=Migration du volume
964+
label.migrate.volume.to.primary.storage=Migration du volume vers un autre stockage primaire
964965
label.minimum=Minimum
965966
label.min.instances=Instances Min.
966967
label.minute.past.hour=minute(s)

‎client/WEB-INF/classes/resources/messages_ja_JP.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,8 @@ label.migrate.router.to=\u30eb\u30fc\u30bf\u30fc\u306e\u79fb\u884c\u5148\:
960960
label.migrate.systemvm.to=\u30b7\u30b9\u30c6\u30e0 VM \u306e\u79fb\u884c\u5148\:
961961
label.migrate.to.host=\u30db\u30b9\u30c8\u3078\u79fb\u884c
962962
label.migrate.to.storage=\u30b9\u30c8\u30ec\u30fc\u30b8\u3078\u79fb\u884c
963+
label.migrate.volume=\u30dc\u30ea\u30e5\u30fc\u30e0\u306e\u79fb\u884c
964+
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
963965
label.minimum=\u6700\u5c0f
964966
label.min.instances=\u6700\u5c0f\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u6570
965967
label.minute.past.hour=\u5206 (\u6bce\u6642)

‎client/WEB-INF/classes/resources/messages_zh_CN.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,8 @@ label.migrate.router.to=\u8fc1\u79fb\u8def\u7531\u5668\u81f3
960960
label.migrate.systemvm.to=\u8fc1\u79fb\u7cfb\u7edf VM \u81f3
961961
label.migrate.to.host=\u8fc1\u79fb\u5230\u4e3b\u673a
962962
label.migrate.to.storage=\u8fc1\u79fb\u5230\u5b58\u50a8
963+
label.migrate.volume=\u8fc1\u79fb\u5377
964+
label.migrate.volume.to.primary.storage=\u5c06\u5377\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u5b58\u50a8
963965
label.minimum=\u6700\u5c0f\u503c
964966
label.min.instances=\u6700\u5c0f\u5b9e\u4f8b\u6570
965967
label.minute.past.hour=\u5206

‎ui/dictionary.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ dictionary = {
835835
'label.migrate.systemvm.to': '<fmt:message key="label.migrate.systemvm.to" />',
836836
'label.migrate.to.host': '<fmt:message key="label.migrate.to.host" />',
837837
'label.migrate.to.storage': '<fmt:message key="label.migrate.to.storage" />',
838-
'label.migrate.volume': '<fmt:message key="label.migrate.volume" />',
838+
'label.migrate.volume.to.primary.storage': '<fmt:message key="label.migrate.volume.to.primary.storage" />',
839839
'label.minimum': '<fmt:message key="label.minimum" />',
840840
'label.minute.past.hour': '<fmt:message key="label.minute.past.hour" />',
841841
'label.monday': '<fmt:message key="label.monday" />',

‎ui/dictionary2.jsp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,7 @@ $.extend(dictionary, {
711711
'label.start.lb.vm': '<fmt:message key="label.start.lb.vm" />',
712712
'label.stop.lb.vm': '<fmt:message key="label.stop.lb.vm" />',
713713
'label.migrate.lb.vm': '<fmt:message key="label.migrate.lb.vm" />',
714+
'label.migrate.volume': '<fmt:message key="label.migrate.volume" />',
714715
'label.vpc.virtual.router': '<fmt:message key="label.vpc.virtual.router" />',
715716
'label.ovs': '<fmt:message key="label.ovs" />',
716717
'label.gslb.service': '<fmt:message key="label.gslb.service" />',

‎ui/scripts/zoneWizard.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,7 @@
16381638
$form.find('[rel=server]').find(".value").find("input").val("localhost");
16391639

16401640
$form.find('[rel=path]').css('display', 'block');
1641-
$form.find('[rel=path]').find(".name").find("label").html("<span class=\"field-required\">*</span>'label.SR.name':");
1641+
$form.find('[rel=path]').find(".name").find("label").html('<span class=\"field-required\">*</span>'+_l('label.SR.name')+':');
16421642

16431643
$form.find('[rel=smbUsername]').hide();
16441644
$form.find('[rel=smbPassword]').hide();

0 commit comments

Comments
 (0)