Commit 28488918 authored by Dietmar Maurer's avatar Dietmar Maurer

do not use gettext() inside render functions

parent 519e3933
...@@ -661,6 +661,8 @@ Ext.define('PVE.Utils', { statics: { ...@@ -661,6 +661,8 @@ Ext.define('PVE.Utils', { statics: {
runningText: gettext('running'), runningText: gettext('running'),
stoppedText: gettext('stopped'), stoppedText: gettext('stopped'),
neverText: gettext('never'), neverText: gettext('never'),
totalText: gettext('Total'),
usedText: gettext('Used'),
format_expire: function(date) { format_expire: function(date) {
if (!date) { if (!date) {
......
...@@ -32,13 +32,10 @@ Ext.define('PVE.node.StatusView', { ...@@ -32,13 +32,10 @@ Ext.define('PVE.node.StatusView', {
return PVE.Utils.format_size(value.shared); return PVE.Utils.format_size(value.shared);
}; };
var totalText = gettext('Total');
var usedText = gettext('Used');
var render_meminfo = function(value) { var render_meminfo = function(value) {
var per = (value.used / value.total)*100; var per = (value.used / value.total)*100;
var text = "<div>" + totalText + ": " + PVE.Utils.format_size(value.total) + "</div>" + var text = "<div>" + PVE.Utils.totalText + ": " + PVE.Utils.format_size(value.total) + "</div>" +
"<div>" + usedText + ": " + PVE.Utils.format_size(value.used) + "</div>"; "<div>" + PVE.Utils.usedText + ": " + PVE.Utils.format_size(value.used) + "</div>";
return text; return text;
}; };
......
...@@ -33,16 +33,16 @@ Ext.define('PVE.openvz.StatusView', { ...@@ -33,16 +33,16 @@ Ext.define('PVE.openvz.StatusView', {
var render_mem = function(value, metaData, record, rowIndex, colIndex, store) { var render_mem = function(value, metaData, record, rowIndex, colIndex, store) {
var maxmem = me.getObjectValue('maxmem', 0); var maxmem = me.getObjectValue('maxmem', 0);
var per = (value / maxmem)*100; var per = (value / maxmem)*100;
var text = "<div>" + gettext('Total') + ": " + PVE.Utils.format_size(maxmem) + "</div>" + var text = "<div>" + PVE.Utils.totalText + ": " + PVE.Utils.format_size(maxmem) + "</div>" +
"<div>" + gettext('Used') + ": " + PVE.Utils.format_size(value) + "</div>"; "<div>" + PVE.Utils.usedText + ": " + PVE.Utils.format_size(value) + "</div>";
return text; return text;
}; };
var render_swap = function(value, metaData, record, rowIndex, colIndex, store) { var render_swap = function(value, metaData, record, rowIndex, colIndex, store) {
var maxswap = me.getObjectValue('maxswap', 0); var maxswap = me.getObjectValue('maxswap', 0);
var per = (value / maxswap)*100; var per = (value / maxswap)*100;
var text = "<div>" + gettext('Total') + ": " + PVE.Utils.format_size(maxswap) + "</div>" + var text = "<div>" + PVE.Utils.totalText + ": " + PVE.Utils.format_size(maxswap) + "</div>" +
"<div>" + gettext('Used') + ": " + PVE.Utils.format_size(value) + "</div>"; "<div>" + PVE.Utils.usedText + ": " + PVE.Utils.format_size(value) + "</div>";
return text; return text;
}; };
......
...@@ -34,8 +34,8 @@ Ext.define('PVE.qemu.StatusView', { ...@@ -34,8 +34,8 @@ Ext.define('PVE.qemu.StatusView', {
var render_mem = function(value, metaData, record, rowIndex, colIndex, store) { var render_mem = function(value, metaData, record, rowIndex, colIndex, store) {
var maxmem = me.getObjectValue('maxmem', 0); var maxmem = me.getObjectValue('maxmem', 0);
var per = (value / maxmem)*100; var per = (value / maxmem)*100;
var text = "<div>" + gettext('Total') + ": " + PVE.Utils.format_size(maxmem) + "</div>" + var text = "<div>" + PVE.Utils.totalText + ": " + PVE.Utils.format_size(maxmem) + "</div>" +
"<div>" + gettext('Used') + ": " + PVE.Utils.format_size(value) + "</div>"; "<div>" + PVE.Utils.usedText + ": " + PVE.Utils.format_size(value) + "</div>";
return text; return text;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment