Skip to content

Commit 8a8f9d8

Browse files
committed
info: Rename Hard Drives to Storage
Fixes #124
1 parent f5b4145 commit 8a8f9d8

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

  • usr/lib/linuxmint/mintreport

usr/lib/linuxmint/mintreport/app.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,12 @@ def get_disk_size():
126126
try:
127127
out = get_process_output(("lsblk", "--json", "--output", "size", "--bytes", "--nodeps"))
128128
jsonobj = json.loads(''.join(out))
129+
for blk in jsonobj['blockdevices']:
130+
disksize += int(blk['size'])
129131
except Exception:
130-
return _("Unknown size"), False
132+
return _("Unknown size")
131133

132-
for blk in jsonobj['blockdevices']:
133-
disksize += int(blk['size'])
134-
135-
return disksize, (len(jsonobj['blockdevices']) > 1)
134+
return disksize
136135

137136

138137
def get_proc_infos():
@@ -380,15 +379,11 @@ def sort_by_date(model, a, b, *args):
380379
else:
381380
infos.append((_("Memory"), procInfos['mem_total']))
382381

383-
diskSize, multipleDisks = get_disk_size()
384-
if multipleDisks:
385-
diskText = _("Hard Drives")
386-
else:
387-
diskText = _("Hard Drive")
382+
diskSize = get_disk_size()
388383
try:
389-
infos.append((diskText, '%.1f %s' % ((diskSize / (1000**3)), _("GB"))))
384+
infos.append((_("Storage"), '%.1f %s' % ((diskSize / (1000**3)), _("GB"))))
390385
except:
391-
infos.append((diskText, diskSize))
386+
infos.append((_("Storage"), diskSize))
392387

393388
desktop = os.getenv("XDG_CURRENT_DESKTOP")
394389
if "cinnamon" in desktop.lower():

0 commit comments

Comments
 (0)