Skip to content

Commit 6bebafd

Browse files
authored
diskspace@schorschii: New option to display label and free space (#1532)
1 parent abd9d8d commit 6bebafd

18 files changed

Lines changed: 997 additions & 427 deletions

File tree

diskspace@schorschii/files/diskspace@schorschii/desklet.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -270,18 +270,23 @@ MyDesklet.prototype = {
270270

271271
let textSub1 = "";
272272
let textSub2 = "";
273+
let name = "";
274+
if(type == "ram") {
275+
name = this.shortText(_("RAM"));
276+
} else if(type == "swap") {
277+
name = this.shortText(_("Swap"));
278+
} else if(fs == "/") {
279+
name = this.shortText(_("Filesystem"));
280+
} else {
281+
let pathparts = fs.split("/");
282+
name = this.shortText(pathparts[pathparts.length-1]);
283+
}
273284
if(this.text_view == "name-size") {
274-
if(type == "ram") {
275-
textSub1 = this.shortText(_("RAM"));
276-
} else if(type == "swap") {
277-
textSub1 = this.shortText(_("Swap"));
278-
} else if(fs == "/") {
279-
textSub1 = this.shortText(_("Filesystem"));
280-
} else {
281-
let pathparts = fs.split("/");
282-
textSub1 = this.shortText(pathparts[pathparts.length-1]);
283-
}
285+
textSub1 = name;
284286
textSub2 = this.niceSize(size);
287+
} else if(this.text_view == "name-free") {
288+
textSub1 = name;
289+
textSub2 = this.niceSize(avail);
285290
} else if(this.text_view == "used-size") {
286291
textSub1 = this.niceSize(use);
287292
textSub2 = this.niceSize(size);

diskspace@schorschii/files/diskspace@schorschii/metadata.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"max-instances": "10",
33
"description": "Displays the usage of a filesystem or RAM.",
44
"name": "Disk Space",
5-
"version": "1.17",
6-
"uuid": "diskspace@schorschii"
7-
}
5+
"version": "1.18",
6+
"uuid": "diskspace@schorschii",
7+
"author": "schorschii"
8+
}

diskspace@schorschii/files/diskspace@schorschii/po/ca.po

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgstr ""
77
"Project-Id-Version: \n"
88
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
99
"issues\n"
10-
"POT-Creation-Date: 2024-05-15 11:44+0200\n"
10+
"POT-Creation-Date: 2025-07-31 12:29-0400\n"
1111
"PO-Revision-Date: 2024-05-15 12:14+0200\n"
1212
"Last-Translator: Daniel <d3vf4n (at) tutanota (dot) com>\n"
1313
"Language-Team: \n"
@@ -22,26 +22,26 @@ msgstr ""
2222
"X-Poedit-SearchPath-1: settings-schema.json\n"
2323

2424
#. settings-schema.json->type->options
25-
#: desklet.js:275 desklet.js:356
25+
#. desklet.js:275 desklet.js:361
2626
msgid "RAM"
2727
msgstr "RAM"
2828

2929
#. settings-schema.json->type->options
30-
#: desklet.js:277 desklet.js:358
30+
#. desklet.js:277 desklet.js:363
3131
msgid "Swap"
3232
msgstr "Memòria d'intercanvi"
3333

3434
#. settings-schema.json->type->options
35-
#: desklet.js:279
35+
#. desklet.js:279
3636
msgid "Filesystem"
3737
msgstr "Sistema de fitxers"
3838

39-
#: desklet.js:301
39+
#. desklet.js:306
4040
msgid "Not Found"
4141
msgstr "No s'ha trobat"
4242

4343
#. metadata.json->name
44-
#: desklet.js:360
44+
#. desklet.js:365
4545
msgid "Disk Space"
4646
msgstr "Espai de disc"
4747

@@ -120,8 +120,8 @@ msgid ""
120120
"Reserved blocks are useable for the root user only and that's why displayed "
121121
"as used space by default."
122122
msgstr ""
123-
"Els blocs reservats son exclusius del superusuari (root), per això es "
124-
"mostra com espai utilitzat per omissió."
123+
"Els blocs reservats son exclusius del superusuari (root), per això es mostra "
124+
"com espai utilitzat per omissió."
125125

126126
#. settings-schema.json->head2->description
127127
msgid "Visual"
@@ -151,6 +151,11 @@ msgstr "Text"
151151
msgid "Name and total space"
152152
msgstr "Nom i mida total"
153153

154+
#. settings-schema.json->text-view->options
155+
#, fuzzy
156+
msgid "Name and free space"
157+
msgstr "Espai lliure i total"
158+
154159
#. settings-schema.json->text-view->options
155160
msgid "Used and total space"
156161
msgstr "Espai utilitzat i total"

diskspace@schorschii/files/diskspace@schorschii/po/da.po

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: \n"
4-
"Report-Msgid-Bugs-To: \n"
5-
"POT-Creation-Date: 2023-12-06 01:23+0300\n"
4+
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
5+
"issues\n"
6+
"POT-Creation-Date: 2025-07-31 12:29-0400\n"
67
"PO-Revision-Date: 2023-12-08 07:38+0100\n"
78
"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
89
"Language-Team: Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
@@ -17,26 +18,26 @@ msgstr ""
1718
"X-Poedit-SearchPath-1: settings-schema.json\n"
1819

1920
#. settings-schema.json->type->options
20-
#: desklet.js:275 desklet.js:356
21+
#. desklet.js:275 desklet.js:361
2122
msgid "RAM"
2223
msgstr "RAM"
2324

2425
#. settings-schema.json->type->options
25-
#: desklet.js:277 desklet.js:358
26+
#. desklet.js:277 desklet.js:363
2627
msgid "Swap"
2728
msgstr "Swap"
2829

2930
#. settings-schema.json->type->options
30-
#: desklet.js:279
31+
#. desklet.js:279
3132
msgid "Filesystem"
3233
msgstr "Filsystem"
3334

34-
#: desklet.js:301
35+
#. desklet.js:306
3536
msgid "Not Found"
3637
msgstr "Ikke fundet"
3738

3839
#. metadata.json->name
39-
#: desklet.js:360
40+
#. desklet.js:365
4041
msgid "Disk Space"
4142
msgstr "Diskplads"
4243

@@ -144,6 +145,11 @@ msgstr "Tekst"
144145
msgid "Name and total space"
145146
msgstr "Navn og total plads"
146147

148+
#. settings-schema.json->text-view->options
149+
#, fuzzy
150+
msgid "Name and free space"
151+
msgstr "Total og ledig plads"
152+
147153
#. settings-schema.json->text-view->options
148154
msgid "Used and total space"
149155
msgstr "Brugt og total plads"

0 commit comments

Comments
 (0)