do not use gettext() inside render functions

diff --git a/www/manager/Utils.js b/www/manager/Utils.js
index 649d2526eed18f895b4b4d01820b64b0f35c9695..2fb5eda38abda0954469cbdd82ade291fca5dad4 100644 (file)
--- a/www/manager/Utils.js
+++ b/www/manager/Utils.js
@@ -661,6 +661,8 @@ Ext.define('PVE.Utils', { statics: {
     runningText: gettext('running'),
     stoppedText: gettext('stopped'),
     neverText: gettext('never'),
+    totalText: gettext('Total'),
+    usedText: gettext('Used'),
 
     format_expire: function(date) {
        if (!date) {

diff --git a/www/manager/node/StatusView.js b/www/manager/node/StatusView.js
index 730ecb7d7dd0624f036e2e7fd3ee152d5fba75d4..e998e3f784a0d86904b70374fa5584e6730e5505 100644 (file)
--- a/www/manager/node/StatusView.js
+++ b/www/manager/node/StatusView.js
@@ -32,13 +32,10 @@ Ext.define('PVE.node.StatusView', {
            return PVE.Utils.format_size(value.shared);
        };
 
-       var totalText = gettext('Total');
-       var usedText = gettext('Used');
-
        var render_meminfo = function(value) {
            var per = (value.used / value.total)*100;
-           var text = "<div>" +  totalText + ": " + PVE.Utils.format_size(value.total) + "</div>" + 
-               "<div>" + usedText + ": " + PVE.Utils.format_size(value.used) + "</div>";
+           var text = "<div>" +  PVE.Utils.totalText + ": " + PVE.Utils.format_size(value.total) + "</div>" + 
+               "<div>" + PVE.Utils.usedText + ": " + PVE.Utils.format_size(value.used) + "</div>";
            return text;
        };
 

diff --git a/www/manager/openvz/StatusView.js b/www/manager/openvz/StatusView.js
index d2f79a047cb01592d807d6c118f73862b70f36f7..25b86be2b0a9a40256519c5385a6a04bb890d30d 100644 (file)
--- a/www/manager/openvz/StatusView.js
+++ b/www/manager/openvz/StatusView.js
@@ -33,16 +33,16 @@ Ext.define('PVE.openvz.StatusView', {
        var render_mem = function(value, metaData, record, rowIndex, colIndex, store) {
            var maxmem = me.getObjectValue('maxmem', 0);
            var per = (value / maxmem)*100;
-           var text = "<div>" + gettext('Total') + ": " + PVE.Utils.format_size(maxmem) + "</div>" + 
-               "<div>" + gettext('Used') + ": " + PVE.Utils.format_size(value) + "</div>";
+           var text = "<div>" + PVE.Utils.totalText + ": " + PVE.Utils.format_size(maxmem) + "</div>" + 
+               "<div>" + PVE.Utils.usedText + ": " + PVE.Utils.format_size(value) + "</div>";
            return text;
        };
 
        var render_swap = function(value, metaData, record, rowIndex, colIndex, store) {
            var maxswap = me.getObjectValue('maxswap', 0);
            var per = (value / maxswap)*100;
-           var text = "<div>" + gettext('Total') + ": " + PVE.Utils.format_size(maxswap) + "</div>" + 
-               "<div>" + gettext('Used') + ": " + PVE.Utils.format_size(value) + "</div>";
+           var text = "<div>" + PVE.Utils.totalText + ": " + PVE.Utils.format_size(maxswap) + "</div>" + 
+               "<div>" + PVE.Utils.usedText + ": " + PVE.Utils.format_size(value) + "</div>";
            return text;
        };
 

diff --git a/www/manager/qemu/StatusView.js b/www/manager/qemu/StatusView.js
index 572b311cc5eef1590c1f1cf79c6c0e635abdd010..ce224e5799ee283e97513ca4cb18a9ea82e48013 100644 (file)
--- a/www/manager/qemu/StatusView.js
+++ b/www/manager/qemu/StatusView.js
@@ -34,8 +34,8 @@ Ext.define('PVE.qemu.StatusView', {
        var render_mem = function(value, metaData, record, rowIndex, colIndex, store) {
            var maxmem = me.getObjectValue('maxmem', 0);
            var per = (value / maxmem)*100;
-           var text = "<div>" + gettext('Total') + ": " + PVE.Utils.format_size(maxmem) + "</div>" + 
-               "<div>" + gettext('Used') + ": " + PVE.Utils.format_size(value) + "</div>";
+           var text = "<div>" + PVE.Utils.totalText + ": " + PVE.Utils.format_size(maxmem) + "</div>" + 
+               "<div>" + PVE.Utils.usedText + ": " + PVE.Utils.format_size(value) + "</div>";
            return text;
        };