shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

b # 3020, b # 3026, b # 3007: some language related fixes.

Browse Source 
(cherry picked from commit 93ce004c06eee97df85cae746dfe99ad0d5f3478)
This commit is contained in:
Jorge Lobo 2019-03-28 14:57:15 +01:00 committed by Ruben S. Montero
parent 7710d4eb9f
commit deedb38144
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
4 changed files with 85 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/general/capacity-create.js
View File

@ -20,29 +20,29 @@ define(function(require) {
*/
// require('foundation.slider');
var Locale = require('utils/locale');
var Tips = require('utils/tips');
var WizardFields = require('utils/wizard-fields');
var UserInputs = require('utils/user-inputs');
var Locale = require("utils/locale");
var Tips = require("utils/tips");
var WizardFields = require("utils/wizard-fields");
var UserInputs = require("utils/user-inputs");
/*
TEMPLATES
*/
var TemplateHTML = require('hbs!./capacity-create/html');
var TemplateHTML = require("hbs!./capacity-create/html");
/*
CONSTRUCTOR
*/
return {
'html': _html,
'setup': _setup,
'fill': _fill,
'retrieve': _retrieve,
'calculatedRealMemory': _calculatedRealMemory,
'calculatedRealCpu': _calculatedRealCpu,
'totalCost': _totalCost
"html": _html,
"setup": _setup,
"fill": _fill,
"retrieve": _retrieve,
"calculatedRealMemory": _calculatedRealMemory,
"calculatedRealCpu": _calculatedRealCpu,
"totalCost": _totalCost
};
/*
@ -65,19 +65,19 @@ define(function(require) {
if(isNaN(val) || val == ""){
return "";
}
return Math.floor(val * 1024);
}
function convertCostNumber(number){
if(number >= 1000000){
number = (number / 1000000).toFixed(2)
number = (number / 1000000).toFixed(2);
return number.toString() + "M";
}
else if (number >= 1000){
number = (number / 1000).toFixed(2)
number = (number / 1000).toFixed(2);
return number.toString() + "K";
}
else if (number >= 0 && number < 1000){
number = (typeof number === "string"? parseFloat(number) : number);
return number.toFixed(2);
}
else {
@ -89,38 +89,41 @@ define(function(require) {
var memory = $("#real_memory_cost").val();
var cpu = $("#real_cpu_cost").val();
var disk_cost = $("#total_value_disk").text();
var elementTotalCost = document.getElementById("total_cost");
if (disk_cost === "") {
disk_cost = 0;
} else {
disk_cost = parseFloat(disk_cost);
}
if ((memory === undefined || memory === "") && (cpu === undefined || cpu === "")){
document.getElementById('total_cost').textContent = "Total: " + disk_cost;
} else if(memory === undefined || memory === ""){
document.getElementById('total_cost').textContent = "Total: " + convertCostNumber(cpu + disk_cost);
} else if(cpu === undefined || cpu === ""){
document.getElementById('total_cost').textContent = "Total: " + convertCostNumber(memory + disk_cost);
} else {
document.getElementById('total_cost').textContent = "Total: " + convertCostNumber(memory + cpu + disk_cost);
if(elementTotalCost){
if ((memory === undefined || memory === "") && (cpu === undefined || cpu === "")){
elementTotalCost.textContent = "Total: " + disk_cost;
} else if(memory === undefined || memory === ""){
elementTotalCost.textContent = "Total: " + convertCostNumber(cpu + disk_cost);
} else if(cpu === undefined || cpu === ""){
elementTotalCost.textContent = "Total: " + convertCostNumber(memory + disk_cost);
} else {
elementTotalCost.textContent = "Total: " + convertCostNumber(memory + cpu + disk_cost);
}
}
}
function _calculatedRealMemory(context){
var memory_cost = $("#MEMORY_COST").val();
var type_cost = $("#MEMORY_UNIT_COST").val();
var memory_cost = $("#MEMORY_COST").val() || 0;
var type_cost = $("#MEMORY_UNIT_COST").val() || 0;
var memory = $("#MEMORY").val();
var type = $("#memory_unit").val();
if (type_cost == "GB"){
memory = (memory / 1024) * memory_cost * 24 * 30;
} else {
memory = memory * memory_cost * 24 * 30;
}
document.getElementById('real_memory_cost').value = memory;
document.getElementById('total_value_memory').textContent = convertCostNumber(memory);
var realMemory = document.getElementById("real_memory_cost");
var totalMemory = document.getElementById("total_value_memory");
if(realMemory && totalMemory){
realMemory.value = memory;
totalMemory.textContent = convertCostNumber(memory);
}
if (memory_cost != "")
$(".total_memory_cost", context).show();
@ -129,17 +132,16 @@ define(function(require) {
}
function _calculatedRealCpu(context){
var cpu_cost = $("#CPU_COST").val();
var cpu = $("#CPU").val();
var cpu_cost = $("#CPU_COST").val() || 0;
var cpu = $("#CPU").val() || 0;
var totalValueCpu = document.getElementById("real_cpu_cost");
cpu = cpu * cpu_cost * 24 * 30;
document.getElementById('real_cpu_cost').value = cpu;
document.getElementById('total_value_cpu').textContent = convertCostNumber(cpu);
document.getElementById("real_cpu_cost").value = cpu;
if(totalValueCpu){
totalValueCpu.textContent = convertCostNumber(cpu);
}
if (cpu_cost != "")
$(".total_cpu_cost", context).show();
_totalCost();
}
@ -203,10 +205,10 @@ define(function(require) {
});
// Unit select
$("#memory_unit", context).on('change', function() {
var memory_unit_val = $('#memory_unit :selected', context).val();
$("#memory_unit", context).on("change", function() {
var memory_unit_val = $("#memory_unit :selected", context).val();
if (memory_unit_val == 'GB') {
if (memory_unit_val == "GB") {
$(".mb_unit", context).hide();
$(".gb_unit", context).show();
} else {
@ -241,10 +243,10 @@ define(function(require) {
*/
function _fill(context, element) {
var fields = $('[wizard_field]', context);
var fields = $("[wizard_field]", context);
fields.each(function() {
var field_name = $(this).attr('wizard_field');
var field_name = $(this).attr("wizard_field");
$(this).data("original_value", element[field_name]);
});
@ -259,7 +261,7 @@ define(function(require) {
$("#memory_unit", context).val("GB").change();
}
var userInputsJSON = element['USER_INPUTS'];
var userInputsJSON = element["USER_INPUTS"];
if (userInputsJSON) {
$.each(["memory","cpu","vcpu"], function(i,classname){
@ -281,7 +283,7 @@ define(function(require) {
$("input.user_input_params_min", param_context).val(values[0]).trigger("input");
$("input.user_input_params_max", param_context).val(values[1]).trigger("input");
} else {
console.error('Wrong user input parameters for "'+name+'". Expected "MIN..MAX", received "'+attr.params+'"');
console.error("Wrong user input parameters for \""+name+"\". Expected \"MIN..MAX\", received \""+attr.params+"\"");
}
} else if (attr.type == "list"){
$("input."+classname+"_modify_opt."+attr.type, context).val(attr.params).trigger("input");
@ -325,7 +327,7 @@ define(function(require) {
attr.mandatory = false;
}
attr.initial = $('input[wizard_field="'+attr.name+'"]', context).val();
attr.initial = $("input[wizard_field=\""+attr.name+"\"]", context).val();
if (attr.type == "range" ||
attr.type == "range-float"){
@ -344,7 +346,7 @@ define(function(require) {
});
if (!$.isEmptyObject(userInputsJSON)) {
templateJSON['USER_INPUTS'] = userInputsJSON;
templateJSON["USER_INPUTS"] = userInputsJSON;
}
return templateJSON;

16
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/io/html.hbs
View File

@ -25,9 +25,9 @@
<input type="radio" wizard_field="TYPE" name="graphics_type" ID="radioVncType{{uniqueId}}" value="VNC" checked>
<label for="radioVncType{{uniqueId}}">VNC</label>
<input type="radio" wizard_field="TYPE" name="graphics_type" ID="radioSdlType{{uniqueId}}" value="SDL" class="hypervisor only_kvm not_lxd" >
<label class="hypervisor only_kvm" for="radioSdlType{{uniqueId}}">SDL</label>
<label class="hypervisor only_kvm not_lxd" for="radioSdlType{{uniqueId}}">SDL</label>
<input type="radio" wizard_field="TYPE" name="graphics_type" ID="radioSpiceType{{uniqueId}}" value="SPICE" class="hypervisor only_kvm not_lxd" >
<label class="hypervisor only_kvm" for="radioSpiceType{{uniqueId}}">SPICE</label>
<label class="hypervisor only_kvm not_lxd" for="radioSpiceType{{uniqueId}}">SPICE</label>
</div>
</div>
<br>
@ -54,7 +54,7 @@
</label>
</div>
</div>
<div class=" hypervisor only_kvm">
<div class="hypervisor only_kvm">
<div class="large-12 columns">
<label>
{{tr "Password"}}
@ -62,7 +62,7 @@
</label>
</div>
</div>
<div class=" hypervisor only_kvm vm_updateconf_hide">
<div class="hypervisor only_kvm vm_updateconf_hide">
<div class="columns large-12">
<input type="checkbox" class="RANDOM_PASSWD graphics-setting" id="RANDOM_PASSWD{{uniqueId}}">
<label for="RANDOM_PASSWD{{uniqueId}}">
@ -70,6 +70,14 @@
</label>
</div>
</div>
<div class="hypervisor only_lxd">
<div class="columns large-12">
<label>
{{tr "Command"}}
<input class="graphics-setting" type="text" wizard_field="COMMAND"/>
</label>
</div>
</div>
</fieldset>
</div>
<div class="medium-6 columns inputs hypervisor only_kvm">

47
src/sunstone/public/app/utils/locale.js
View File

@ -18,26 +18,25 @@ define(function(require) {
var sprintf = require("sprintf").sprintf;
var LANGUAGE_OPTIONS =
'<option value="en_US">English (en_US)</option>\
<option value="ca">Catalan (ca)</option>\
<option value="cs_CZ">Czech (cs_CZ)</option>\
<option value="nl_NL">Dutch (nl_NL)</option>\
<option value="da">Danish (da)</option>\
<option value="fr_FR">French (fr_FR)</option>\
<option value="de">German (de)</option>\
<option value="el_GR">Greek (el_GR)</option>\
<option value="it_IT">Italian (it_IT)</option>\
<option value="ja">Japanese (ja)</option>\
<option value="lt_LT">Lithuanian (lt_LT)</option>\
<option value="fa_IR">Persian (fa_IR)</option>\
<option value="pl">Polish (pl)</option>\
<option value="pt_BR">Portuguese (pt_BR)</option>\
<option value="pt_PT">Portuguese (pt_PT)</option>\
<option value="tr_TR">Turkish (tr_TR)</option>\
<option value="ru_RU">Russian (ru_RU)</option>\
<option value="zh_CN">Simplified Chinese (zh_CN)</option>\
<option value="sk_SK">Slovak (sk_SK)</option>\
<option value="es_ES">Spanish (es_ES)</option>';
"<option value=\"en_US\">English (en_US)</option>\
<option value=\"ca\">Catalan (ca)</option>\
<option value=\"cs_CZ\">Czech (cs_CZ)</option>\
<option value=\"nl_NL\">Dutch (nl_NL)</option>\
<option value=\"da\">Danish (da)</option>\
<option value=\"fr_FR\">French (fr_FR)</option>\
<option value=\"de\">German (de)</option>\
<option value=\"it_IT\">Italian (it_IT)</option>\
<option value=\"ja\">Japanese (ja)</option>\
<option value=\"lt_LT\">Lithuanian (lt_LT)</option>\
<option value=\"fa_IR\">Persian (fa_IR)</option>\
<option value=\"pl\">Polish (pl)</option>\
<option value=\"pt_BR\">Portuguese (pt_BR)</option>\
<option value=\"pt_PT\">Portuguese (pt_PT)</option>\
<option value=\"tr_TR\">Turkish (tr_TR)</option>\
<option value=\"ru_RU\">Russian (ru_RU)</option>\
<option value=\"zh_CN\">Simplified Chinese (zh_CN)</option>\
<option value=\"sk_SK\">Slovak (sk_SK)</option>\
<option value=\"es_ES\">Spanish (es_ES)</option>";
var MONTHS = new Array(
tr("January"), tr("February"), tr("March"), tr("April"), tr("May"),
@ -58,8 +57,8 @@ define(function(require) {
};
return {
'tr': tr,
'months': MONTHS,
'language_options': LANGUAGE_OPTIONS
}
"tr": tr,
"months": MONTHS,
"language_options": LANGUAGE_OPTIONS
};
});

1
src/sunstone/public/locale/languages/SConstruct
View File

@ -28,7 +28,6 @@ env.Po('ca.po')
env.Po('cs_CZ.po')
env.Po('da.po')
env.Po('de.po')
env.Po('el_GR.po')
env.Po('en_US.po')
env.Po('es_ES.po')
env.Po('tr_TR.po')