|
|
|
@ -79,8 +79,9 @@ local function shorten(number)
|
|
|
|
|
return string.format("%.2f", number);
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
function Usage:dump(kv_pairs)
|
|
|
|
|
table.insert(kv_pairs, {INDENTATION .. _("Consumed %"), shorten(self.percentage)})
|
|
|
|
|
function Usage:dump(kv_pairs, id)
|
|
|
|
|
local name = id or _("Consumed %")
|
|
|
|
|
table.insert(kv_pairs, {INDENTATION .. name, shorten(self.percentage)})
|
|
|
|
|
table.insert(kv_pairs, {INDENTATION .. _("Total time"), util.secondsToHClock(self.time, true, true)})
|
|
|
|
|
table.insert(kv_pairs, {INDENTATION .. _("% per hour"), shorten(self:percentagePerHour())})
|
|
|
|
|
end
|
|
|
|
@ -254,7 +255,7 @@ function BatteryStat:dump()
|
|
|
|
|
self.sleeping:dump(kv_pairs)
|
|
|
|
|
self.sleeping:dumpRemaining(kv_pairs)
|
|
|
|
|
table.insert(kv_pairs, {_("During last charge"), ""})
|
|
|
|
|
self.charging:dump(kv_pairs)
|
|
|
|
|
self.charging:dump(kv_pairs, _("Charged %"))
|
|
|
|
|
self.charging:dumpCharging(kv_pairs)
|
|
|
|
|
table.insert(kv_pairs, {_("Since last charge"), ""})
|
|
|
|
|
self.discharging:dump(kv_pairs)
|
|
|
|
|