Skip to content

Commit

Permalink
Release v26
Browse files Browse the repository at this point in the history
  • Loading branch information
ljuzig committed Sep 16, 2024
1 parent 08ac216 commit ebcb00b
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 21 deletions.
3 changes: 2 additions & 1 deletion RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Astra Monitor 26 - TO BE RELEASED
# Astra Monitor 26 - September 16 2024

### New features

- GNOME 47 support [[#143](https://github.com/AstraExt/astra-monitor/issues/143)]

### Bug fixes
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"settings-schema": "org.gnome.shell.extensions.astra-monitor",
"gettext-domain": "monitor@astraext.github.io",
"license": "GPL-3.0-or-later",
"version": 42,
"version-name": "25",
"version": 43,
"version-name": "26",
"donations": {
"buymeacoffee": "astra.ext",
"patreon": "AstraExt"
Expand Down
6 changes: 5 additions & 1 deletion po/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Astra Monitor 19\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-08 02:16+0200\n"
"POT-Creation-Date: 2024-09-16 14:52+0200\n"
"Last-Translator: Mikulas Stastny <mikusaq@seznam.cz>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -2155,6 +2155,10 @@ msgstr "Ovladače"
msgid "Modules"
msgstr "Moduly"

#, fuzzy
#~ msgid "What's Shell TOPBAR/DASH/PANEL Position?"
#~ msgstr "Pozice lišty shellu"

#~ msgid "Domain"
#~ msgstr "Doména"

Expand Down
2 changes: 1 addition & 1 deletion po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Astra Monitor 8\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-08 02:16+0200\n"
"POT-Creation-Date: 2024-09-16 14:52+0200\n"
"PO-Revision-Date: 2024-01-21 12:11+0100\n"
"Last-Translator: Philipp Kiemle <philipp.kiemle@gmail.com>\n"
"Language-Team: \n"
Expand Down
6 changes: 5 additions & 1 deletion po/ka.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: AstraMonitor\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-08 02:16+0200\n"
"POT-Creation-Date: 2024-09-16 14:52+0200\n"
"PO-Revision-Date: 2024-04-27 11:41+0200\n"
"Last-Translator: George Salukvadze <giosal90@gmail.com>\n"
"Language-Team: ka\n"
Expand Down Expand Up @@ -2252,6 +2252,10 @@ msgstr "დრაივერები"
msgid "Modules"
msgstr "მოდულები"

#, fuzzy
#~ msgid "What's Shell TOPBAR/DASH/PANEL Position?"
#~ msgstr "ინტერფეისის TOPBAR/DASH/PANEL-ის პოზიცია"

#~ msgid "Domain"
#~ msgstr "დომენი"

Expand Down
4 changes: 2 additions & 2 deletions po/monitor@astraext.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Astra Monitor 42\n"
"Project-Id-Version: Astra Monitor 43\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-08 02:17+0200\n"
"POT-Creation-Date: 2024-09-16 14:52+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down
6 changes: 5 additions & 1 deletion po/pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Astra Monitor 36\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-08 02:16+0200\n"
"POT-Creation-Date: 2024-09-16 14:52+0200\n"
"PO-Revision-Date: 2024-04-24 18:28+0200\n"
"Last-Translator: awumii <awumii@protonmail.com>\n"
"Language-Team: awumii <awumii@protonmail.com>\n"
Expand Down Expand Up @@ -2181,3 +2181,7 @@ msgstr "Sterowniki"
#: src/gpu/gpuMenuComponent.js:502
msgid "Modules"
msgstr "Moduły"

#, fuzzy
#~ msgid "What's Shell TOPBAR/DASH/PANEL Position?"
#~ msgstr "Pozycja panelu/paska powłoki"
2 changes: 1 addition & 1 deletion po/ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: AstraMonitor 1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-08 02:16+0200\n"
"POT-Creation-Date: 2024-09-16 14:52+0200\n"
"PO-Revision-Date: 2024-02-13 12:28+0300\n"
"Last-Translator: Aleksandr Melman <Alexmelman88@gmail.com>\n"
"Language-Team: ru\n"
Expand Down
5 changes: 2 additions & 3 deletions src/sensors/sensorsMenu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export default class SensorsMenu extends MenuBase {
let cols = 1;
if(valueTreeExtimatedHeight > monitorSize.height * 0.8) cols = 2;
if(valueTreeExtimatedHeight > monitorSize.height * 0.8 * 2) cols = 3;

const popupGrid = new Grid({
numCols: cols * 2,
styleClass: 'astra-monitor-menu-subgrid',
Expand All @@ -180,8 +180,7 @@ export default class SensorsMenu extends MenuBase {
let num = 0;
for(const [categoryName, category] of valueTree.entries()) {
let style = '';
if(cols > 1 && num % cols < cols-1)
style = 'margin-right:0.5em;';
if(cols > 1 && num % cols < cols - 1) style = 'margin-right:0.5em;';

const categoryGrid = new Grid({
numCols: 3,
Expand Down
2 changes: 1 addition & 1 deletion src/sensors/sensorsMonitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ export default class SensorsMonitor extends Monitor {
try {
let lmSensorsDataValue = await lmSensorsData.getValue();
if(!lmSensorsDataValue) return false;

// remove trailing commas
lmSensorsDataValue = lmSensorsDataValue.replace(/,\s*(?=}|])/g, '');

Expand Down
14 changes: 7 additions & 7 deletions src/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ export default class Utils {
if(stdout.length > 0) {
const decoder = new TextDecoder('utf8');
let stdoutString = decoder.decode(stdout);

// remove trailing commas
stdoutString = stdoutString.replace(/,\s*(?=}|])/g, '');
const parsedData = JSON.parse(stdoutString);
Expand Down Expand Up @@ -1158,17 +1158,17 @@ export default class Utils {
return value;
}
}

static getCPUModelShortify(model: string): string {
// replace (R)
model = model.replace(/\(R\)/g, '');

// replace (TM)
model = model.replace(/\(TM\)/g, '');

// replace (C)
model = model.replace(/\(C\)/g, '');

// replace multiple spaces with single space
model = model.replace(/\s+/g, ' ');

Expand Down Expand Up @@ -1366,10 +1366,10 @@ export default class Utils {

// replace '(R)'
model = model.replace('(R)', '');

// replace '(TM)'
model = model.replace('(TM)', '');

// replace '(C)'
model = model.replace('(C)', '');

Expand Down

0 comments on commit ebcb00b

Please sign in to comment.