CLOUDSTACK-7645
[UI] Fix incorrect strings 'label.no' and 'label.added.network.offering'
Conflicts:
ui/dictionary2.jsp
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e820b37
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e820b37
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e820b37
Branch: refs/heads/master
Commit: 4e820b37b0b8f5318e992330a3a9a7f6f9998cff
Parents: d82e556
Author: Mihaela Stoica <mihaela.sto...@citrix.com>
Authored: Tue Nov 4 16:22:20 2014 +0000
Committer: Brian Federle <brian.fede...@citrix.com>
Committed: Wed Nov 12 08:24:10 2014 -0800
----------------------------------------------------------------------
ui/dictionary2.jsp | 3 +++
ui/scripts/configuration.js | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e820b37/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 8f2a378..28b4f05 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -1010,5 +1010,8 @@ dictionary2 = {
'label.agent.state': '<fmt:message key="label.agent.state" />',
'label.duration.in.sec': '<fmt:message key="label.duration.in.sec" />',
'state.detached': '<fmt:message key="state.detached" />',
+'label.na': '<fmt:message key="label.na" />',
+'label.added.network.offering': '<fmt:message
key="label.added.network.offering" />',
+'label.no': '<fmt:message key="label.no" />'
};
</script>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e820b37/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index f88ba85..2a9829d 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';
}
}
}
