etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 4556: localize adding action in middle menu.

This commit is contained in:
Jessica Wang 2011-01-28 11:35:33 -08:00
parent 4696b16d10
commit 38857cf47c
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/WEB-INF/classes/resources/messages.properties
View File

@ -16,6 +16,9 @@ label.actions=Actions
label.zone=Zone
label.pod=Pod
label.add=Add
label.adding.processing=Adding....
label.adding.succeeded=Adding Succeeded
label.adding.failed=Adding Failed
label.add.zone=Add Zone
label.adding.zone=Adding Zone
label.add.host=Add Host

8
ui/index.jsp
View File

@ -62,6 +62,14 @@
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<title><fmt:message key="label.cloud.console"/></title>
<script language="javascript">
g_dictionary = {
'label.adding.processing' : '<fmt:message key="label.adding.processing"/>',
'label.adding.succeeded' : '<fmt:message key="label.adding.succeeded"/>',
'label.adding.failed' : '<fmt:message key="label.adding.failed"/>'
};
</script>
</head>
<body>
<!-- Main Login Dialog (begin)-->

9
ui/scripts/cloud.core.js
View File

@ -698,7 +698,7 @@ function isMiddleMenuShown() {
// adding middle menu item ***
function beforeAddingMidMenuItem() {
var $midmenuItem1 = $("#midmenu_item").clone().attr("id", "midmenu_item_clone");
$midmenuItem1.find("#first_row").text("Adding....");
$midmenuItem1.find("#first_row").text(g_dictionary["label.adding.processing"]);
$midmenuItem1.find("#second_row").html("&nbsp;");
$midmenuItem1.find("#content").addClass("inaction");
$midmenuItem1.find("#spinning_wheel").show();
@ -712,7 +712,7 @@ function afterAddingMidMenuItem($midmenuItem1, isSuccessful, secondRowText) {
if(isSuccessful == true) {
$midmenuItem1.find("#info_icon").removeClass("error").show();
$midmenuItem1.data("afterActionInfo", ("Adding succeeded."));
$midmenuItem1.data("afterActionInfo", g_dictionary["label.adding.succeeded"]);
var $container = $("#midmenu_container");
if($("#midmenu_container").find("#multiple_selection_sub_container").length > 0) {
@ -731,7 +731,7 @@ function afterAddingMidMenuItem($midmenuItem1, isSuccessful, secondRowText) {
$midmenuItem1.find("#content").addClass("addingfailed");
$midmenuItem1.find("#icon").attr("src", "images/addingfailed_icon.png");
$midmenuItem1.find("#icon_container").show();
$midmenuItem1.find("#first_row").text("Adding failed");
$midmenuItem1.find("#first_row").text(g_dictionary["label.adding.failed"]);
$midmenuItem1.find("#close_icon").show().bind("click", function(event) {
$midmenuItem1.slideUp("slow", function() {
@ -1274,7 +1274,8 @@ var ERROR_INTERNET_CANNOT_CONNECT = 12029;
var ERROR_VMOPS_ACCOUNT_ERROR = 531;
//localization
var dictionary = {};
var dictionary = {}; //initialized in each JSP file
var g_dictionary = {}; //initialized in index.jsp
var g_logger = new Logger();
$(function() {