diff --git a/src/cloud/occi/lib/ui/public/js/locale.js b/src/cloud/occi/lib/ui/public/js/locale.js index bfec7d8f4e..5d0787c62e 100644 --- a/src/cloud/occi/lib/ui/public/js/locale.js +++ b/src/cloud/occi/lib/ui/public/js/locale.js @@ -30,16 +30,18 @@ function tr(str){ //Pops up loading new language dialog. Retrieves the user template, updates the LANG variable. //Updates template and session configuration and reloads the view. function setLang(lang_str){ - var dialog = $('
'+tr("Loading new language... please wait")+' '+spinner+'
').dialog({ - draggable:false, - modal:true, - resizable:false, - buttons:{}, - width: 460, - minHeight: 50 + var dialog = $('
'+ + tr("Loading new language... please wait")+ + ' '+spinner+'
').dialog({ + draggable:false, + modal:true, + resizable:false, + buttons:{}, + width: 460, + minHeight: 50 + }); - }); - if (('localStorage' in window) && (window['localStorage'] !== null)){ localStorage['lang']=lang_str; }; diff --git a/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js b/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js index d36fd78cb4..af44b104e6 100644 --- a/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js +++ b/src/cloud/occi/lib/ui/public/locale/en_US/en_US.js @@ -5,6 +5,7 @@ locale={ "Additionally, OpenNebula Self-Service allows easy customization of the interface (e.g. this text) and brings multi-language support.":"", "Additionally, you can run several operations on defined storages, such as defining their persistance. Persistent images can only be used by 1 virtual machine, and the changes made by it have effect on the base image. Non-persistent images are cloned before being used in a Virtual Machine, therefore changes are lost unless a snapshot is taken prior to Virtual Machine shutdown.":"", "Additionally, you can take a \'snapshot\' of the storage attached to these resources. They will be saved as new resources, visible from the Storage view and re-usable.":"", + "Address":"", "Add storage":"", "All":"", "are mandatory":"", @@ -59,6 +60,7 @@ locale={ "IP":"", "Language":"", "Loading":"", + "Loading new language... please wait":"", "MAC":"", "Make non persistent":"", "Make persistent":"", @@ -135,6 +137,7 @@ locale={ "Unpublish":"", "Update":"", "Update template":"", + "Used leases":"", "Useful links":"", "Virtual Machine information":"", "virtual machines":"", diff --git a/src/sunstone/public/js/locale.js b/src/sunstone/public/js/locale.js index d5b1e970c5..6c3b21ac0e 100644 --- a/src/sunstone/public/js/locale.js +++ b/src/sunstone/public/js/locale.js @@ -31,15 +31,17 @@ function tr(str){ //Updates template and session configuration and reloads the view. function setLang(lang_str){ var lang_tmp=""; - var dialog = $('
'+tr("Loading new language... please wait")+' '+spinner+'
').dialog({ - draggable:false, - modal:true, - resizable:false, - buttons:{}, - width: 460, - minHeight: 50 - - }); + var dialog = $('
'+ + tr("Loading new language... please wait")+ + ' '+spinner+'
').dialog({ + draggable:false, + modal:true, + resizable:false, + buttons:{}, + width: 460, + minHeight: 50 + }); var updateUserTemplate = function(request,user_json){ var template = user_json.USER.TEMPLATE; diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 5ce9543a75..e702a0d0b4 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -60,8 +60,8 @@ var create_user_tmpl = \
\
\ - \ - \ + \ + \
\
\ '; @@ -283,7 +283,7 @@ var user_buttons = { // }, "User.delete" : { type: "action", - text: "Delete" + text: tr("Delete") } } diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index de1000a875..4a08614243 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -882,7 +882,7 @@ function popUpSaveasDialog(elems){ \ \ \ - \ \ \ \ diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 5e3ba99707..8749c8ebc7 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -365,7 +365,7 @@ var vnet_buttons = { "Network.chgrp" : { type: "confirm_with_select", - text: "Change group", + text: tr("Change group"), select: groups_sel, tip: tr("Select the new group")+":", condition: mustBeAdmin, @@ -502,7 +502,7 @@ function updateVNetworkInfo(request,vn){ \ \ '+tr("Public")+'\ - '+(parseInt(vn_info.PUBLIC) ? "yes" : "no" )+'\ + '+(parseInt(vn_info.PUBLIC) ? tr("yes") : tr("no") )+'\ \ \ '+tr("Physical device")+'\ diff --git a/src/sunstone/public/locale/en_US/en_US.js b/src/sunstone/public/locale/en_US/en_US.js index 1c0df1f1fe..223055d2a0 100644 --- a/src/sunstone/public/locale/en_US/en_US.js +++ b/src/sunstone/public/locale/en_US/en_US.js @@ -198,6 +198,7 @@ locale={ "Listen IP":"", "Live migrate":"", "Loading":"", + "Loading new language... please wait":"", "MAC":"", "Make non persistent":"", "Make persistent":"", @@ -298,6 +299,7 @@ locale={ "Raw":"", "Raw data to be passed directly to the hypervisor":"", "Read only":"", + "Reboot":"", "Refresh list":"", "Register time":"", "Registration time":"", @@ -390,6 +392,7 @@ locale={ "This will release held machines":"", "This will resubmits VMs to PENDING state":"", "This will resume selected stopped or suspended VMs":"", + "This will send a reboot action to running VMs":"", "This will suspend selected machines":"", "TM MAD":"", "total":"",