From f740a4f30b88b42fefb6225783c6378468ed4a2e Mon Sep 17 00:00:00 2001 From: Gabriele Date: Sun, 14 Dec 2014 10:00:00 +0100 Subject: [PATCH] WebUI: Make transfer info look like in the regular UI The string for the transfer info was not translated as it should have. Drop it completely. --- src/webui/www/public/scripts/client.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/webui/www/public/scripts/client.js b/src/webui/www/public/scripts/client.js index 8602f72a3..a46b94c7a 100644 --- a/src/webui/www/public/scripts/client.js +++ b/src/webui/www/public/scripts/client.js @@ -240,20 +240,18 @@ window.addEvent('load', function () { }, onSuccess : function (info) { if (info) { - dl_limit = ""; + var transfer_info = ""; if (info.dl_rate_limit != undefined) - dl_limit = "[%1] ".replace("%1", friendlyUnit(info.dl_rate_limit, true)); - $("DlInfos").set('html', "%3_(D: %1 - T: %2)" - .replace("%1", friendlyUnit(info.dl_info_speed, true)) - .replace("%2", friendlyUnit(info.dl_info_data, false)) - .replace("%3", dl_limit)); - up_limit = ""; + transfer_info += "[" + friendlyUnit(info.dl_rate_limit, true) + "] "; + transfer_info += friendlyUnit(info.dl_info_speed, true); + transfer_info += " (" + friendlyUnit(info.dl_info_data, false) + ")" + $("DlInfos").set('html', transfer_info); + transfer_info = ""; if (info.up_rate_limit != undefined) - up_limit = "[%1] ".replace("%1", friendlyUnit(info.up_rate_limit, true)); - $("UpInfos").set('html', "%3_(U: %1 - T: %2)" - .replace("%1", friendlyUnit(info.up_info_speed, true)) - .replace("%2", friendlyUnit(info.up_info_data, false)) - .replace("%3", up_limit)); + transfer_info += "[" + friendlyUnit(info.up_rate_limit, true) + "] "; + transfer_info += friendlyUnit(info.up_info_speed, true) + transfer_info += " (" + friendlyUnit(info.up_info_data, false) + ")" + $("UpInfos").set('html', transfer_info); if (speedInTitle) document.title = "_(D:%1 U:%2)".replace("%1", friendlyUnit(info.dl_info_speed, true)).replace("%2", friendlyUnit(info.up_info_speed, true)); else