12 Commits

Author SHA1 Message Date
Brian Federle
ebd42a8435 Fix missing 'add LDAP account' label 2014-11-21 09:16:41 -08:00
vetrivelc
66e805cba9 Fixes: Hardcoded strings externalized from various JS files.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-11-21 08:02:49 -08:00
vetrivelc
5327038c16 Missing label id and removed duplicate label.ids.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-11-18 14:03:13 -08:00
Rajani Karuturi
8c9093b1df Merge branch '4.5'
Conflicts:
	framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
	plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_escalations_instances.py
	ui/dictionary2.jsp
	ui/scripts/cloudStack.js

This closes #38
2014-11-13 14:53:05 +05:30
Brian Federle
68745ae9b1 CLOUDSTACK-7645: UI: Fix method for extending dictionary
Instead of mapping both dictionary JSP files to separate objects, extend
dictionary2's object onto single 'dictionary' object.

-- The previous approach was causing issues on certain dialogs, which were not
opening due to possible missing labels.
2014-11-12 09:57:42 -08:00
Mihaela Stoica
4e820b37b0 CLOUDSTACK-7645
[UI] Fix incorrect strings 'label.no' and 'label.added.network.offering'

Conflicts:
	ui/dictionary2.jsp
2014-11-12 08:24:10 -08:00
Mihaela Stoica
4e80253b36 CLOUDSTACK-7645
[UI] Fix incorrect strings 'label.no' and 'label.added.network.offering'
2014-11-04 13:05:15 -08:00
vetrivelc
03fa319473 Fixes: [UI] Added missing label to properties.file.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-11-04 13:01:22 -08:00
vetrivelc
4e1284147e Fixed incorrect label issue.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-10-23 13:25:20 -07:00
Mihaela Stoica
28f8c41a19 CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances of "???label.*???"
- removed duplicate entries in dictionary
- added dictionary entries that have been missed during the dictionary split
- added missing entries in messages.properties
- fixed other localization issues

(cherry picked from commit 0646588fc6d5cfc6d9b0da80d8e44697d72005d3)
2014-10-13 00:23:20 -04:00
Mihaela Stoica
0646588fc6 CLOUDSTACK-7645: [UI] Fixing incorrect labels, including instances of "???label.*???"
- removed duplicate entries in dictionary
- added dictionary entries that have been missed during the dictionary split
- added missing entries in messages.properties
- fixed other localization issues
2014-10-02 10:51:52 -07:00
vetrivelc
6a11d099cf Fix Externalization of hard-coded label strings
-Split 'dictionary.jsp' into two files -> 'dictionary.jsp' and
'dictionary2.jsp' -- this is due to JSP file constraints as the
localization object is getting quite long

-Per change above, 'dictionary' object is now split into an additonal
'dictionary2' object, which is merged with the main dict object on page
load

-All new dictionary mappings should be added to 'dictionary2' now.

Signed-off-by: Brian Federle <brian.federle@citrix.com>
2014-09-17 13:59:13 -07:00