From 4e820b37b0b8f5318e992330a3a9a7f6f9998cff Mon Sep 17 00:00:00 2001 From: Mihaela Stoica Date: Tue, 4 Nov 2014 16:22:20 +0000 Subject: [PATCH] CLOUDSTACK-7645 [UI] Fix incorrect strings 'label.no' and 'label.added.network.offering' Conflicts: ui/dictionary2.jsp --- ui/dictionary2.jsp | 3 +++ ui/scripts/configuration.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp index 8f2a378de81..28b4f05787b 100644 --- a/ui/dictionary2.jsp +++ b/ui/dictionary2.jsp @@ -1010,5 +1010,8 @@ dictionary2 = { 'label.agent.state': '', 'label.duration.in.sec': '', 'state.detached': '', +'label.na': '', +'label.added.network.offering': '', +'label.no': '' }; diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index f88ba851597..2a9829d47be 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -3167,7 +3167,7 @@ messages: { notification: function(args) { - return 'label.added.network.offering'; + return 'label.add.network.offering'; } } }