Skip to content

Commit 89116da

Browse files
committed
feat: Update deps
1 parent 1b9a931 commit 89116da

5 files changed

Lines changed: 20 additions & 15 deletions

File tree

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ jobs:
4747
with:
4848
pkgs: libnick
4949
triplet: ${{ matrix.variant.triplet }}
50-
revision: 4887ad6d1414f74cb7cb8d1e527fb46adb4e9ace
50+
revision: 8d7ea9fa4dd9177e87d0c979152645b936501227
5151
token: ${{ github.token }}
52-
cache-key: ${{ matrix.variant.triplet }}-4887ad6d1414f74cb7cb8d1e527fb46adb4e9ace
52+
cache-key: ${{ matrix.variant.triplet }}-8d7ea9fa4dd9177e87d0c979152645b936501227
5353
- name: "Build (Installer)"
5454
working-directory: ${{ github.workspace }}/build
5555
run: |

flatpak/org.nickvision.application.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@
5555
},
5656
{
5757
"name": "maddy",
58-
"buildsystem": "simple",
59-
"build-commands": [
60-
"mkdir -p /app/include/maddy",
61-
"mv include/maddy/* /app/include/maddy"
58+
"buildsystem": "cmake-ninja",
59+
"builddir": true,
60+
"config-opts": [
61+
"-DCMAKE_BUILD_TYPE=Release"
6262
],
6363
"sources": [
6464
{
6565
"type": "git",
6666
"url": "https://github.com/progsource/maddy",
67-
"tag": "1.5.0"
67+
"tag": "1.6.0"
6868
}
6969
]
7070
},
@@ -114,7 +114,7 @@
114114
{
115115
"type": "git",
116116
"url": "https://github.com/nickvisionapps/libnick",
117-
"tag": "2025.7.3"
117+
"tag": "2025.7.4"
118118
}
119119
]
120120
},

libapplication/src/controllers/preferencesviewcontroller.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "controllers/preferencesviewcontroller.h"
2+
#include <algorithm>
23
#include <libnick/localization/gettext.h>
34

45
using namespace Nickvision::Application::Shared::Models;
@@ -10,8 +11,9 @@ namespace Nickvision::Application::Shared::Controllers
1011
: m_configuration{ configuration },
1112
m_availableTranslationLanguages{ Gettext::getAvailableLanguages() }
1213
{
14+
m_availableTranslationLanguages.push_back("en_US");
15+
std::sort(m_availableTranslationLanguages.begin(), m_availableTranslationLanguages.end());
1316
m_availableTranslationLanguages.insert(m_availableTranslationLanguages.begin(), _("System"));
14-
m_availableTranslationLanguages.insert(m_availableTranslationLanguages.begin(), _("None"));
1517
}
1618

1719
Theme PreferencesViewController::getTheme() const
@@ -38,7 +40,7 @@ namespace Nickvision::Application::Shared::Controllers
3840
}
3941
else if(language == "C")
4042
{
41-
return _("None");
43+
return "en_US";
4244
}
4345
return language;
4446
}
@@ -49,7 +51,7 @@ namespace Nickvision::Application::Shared::Controllers
4951
{
5052
m_configuration.setTranslationLanguage("");
5153
}
52-
else if(language == _("None"))
54+
else if(language == "en_US")
5355
{
5456
m_configuration.setTranslationLanguage("C");
5557
}

resources/po/application.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-07-20 14:10-0400\n"
11+
"POT-Creation-Date: 2025-07-20 14:07-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"

snap/snapcraft.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,18 @@ parts:
3939

4040
maddy:
4141
source: https://github.com/progsource/maddy.git
42-
source-tag: '1.5.0'
42+
source-tag: '1.6.0'
4343
source-depth: 1
44-
plugin: dump
44+
plugin: cmake
45+
cmake-parameters:
46+
- -DCMAKE_BUILD_TYPE=Release
47+
- -DCMAKE_INSTALL_PREFIX=/usr
4548
override-prime: ''
4649

4750
libnick:
4851
after: [cpr, maddy]
4952
source: https://github.com/nickvisionapps/libnick.git
50-
source-commit: '0f7c048f4a45984378749f5119d4091966ae1a2c'
53+
source-tag: '2025.7.4'
5154
source-depth: 1
5255
plugin: cmake
5356
cmake-parameters:

0 commit comments

Comments
 (0)