Merge pull request #74 from NickvisionApps/next

V2025.5.2

Author: nlogozzo

CHANGELOG.md

@@ -1,11 +1,20 @@
 # Changelog
 
+## 2025.5.2
+### Breaking Changes
+None
+### New APIs
+#### Localization
+- Added `_fn()` macro for creating strings with translated plural format strings
+### Fixes
+- Fixed compilation on x86 Windows
+
 ## 2025.5.1
 ### Breaking Changes
 #### System
 - A Process' status can now be queued with `Process::getState()` which returns a `ProcessState` value
 ### New APIs
-#### Localizationm
+#### Localization
 - Added `_f()` macro for creating strings with translated format strings
 - Added `Gettext::getAvailableLanguages()` function
 #### System

CMakeLists.txt

@@ -20,7 +20,7 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 #libnick Definition
-project ("libnick" LANGUAGES C CXX VERSION 2025.5.1 DESCRIPTION "A cross-platform base for native Nickvision applications.")
+project ("libnick" LANGUAGES C CXX VERSION 2025.5.2 DESCRIPTION "A cross-platform base for native Nickvision applications.")
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 include(CTest)

Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = "libnick"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "2025.5.1"
+PROJECT_NUMBER         = "2025.5.2"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

include/localization/gettext.h

@@ -32,6 +32,7 @@
 #define _(String) dgettext(::Nickvision::Localization::Gettext::getDomainName().c_str(), String)
 #define _n(String, StringPlural, N) dngettext(::Nickvision::Localization::Gettext::getDomainName().c_str(), String, StringPlural, static_cast<unsigned long>(N))
 #define _f(String, ...) ::Nickvision::Localization::Gettext::fgettext(String, __VA_ARGS__)
+#define _fn(String, StringPlural, N, ...) ::Nickvision::Localization::Gettext::fngettext(String, StringPlural, static_cast<unsigned long>(N), __VA_ARGS__)
 #define _p(Context, String) ::Nickvision::Localization::Gettext::pgettext(Context GETTEXT_CONTEXT_SEPARATOR String, String)
 #define _pn(Context, String, StringPlural, N) ::Nickvision::Localization::Gettext::pngettext(Context GETTEXT_CONTEXT_SEPARATOR String, String, StringPlural, static_cast<unsigned long>(N))
 
@@ -65,6 +66,20 @@ namespace Nickvision::Localization::Gettext
         res = std::vformat(_(msg), std::make_format_args(args...));
         return res.c_str();
     }
+    /**
+     * @brief Translates a plural message and formats it with the given arguments.
+     * @param msg The message to translate
+     * @param msgPlural The plural version of the message to translate
+     * @param n The number of objects (used to determine whether or not to use the plural version of the message)
+     * @param args The arguments to format the translated message with
+     */
+    template<typename... Args>
+    const char* fngettext(const char* msg, const char* msgPlural, unsigned long n, Args&&... args)
+    {
+        static std::string res;
+        res = std::vformat(_n(msg, msgPlural, n), std::make_format_args(args...));
+        return res.c_str();
+    }
     /**
      * @brief Translates a message for a given context.
      * @param context The context of the message

manual/README.md

@@ -6,20 +6,14 @@
 
 libnick provides Nickvision apps with a common set of cross-platform APIs for managing system and desktop app functionality such as network management, taskbar icons, translations, app updates, and more.
 
-## 2025.5.1
+## 2025.5.2
 ### Breaking Changes
-#### System
-- A Process' status can now be queued with `Process::getState()` which returns a `ProcessState` value
+None
 ### New APIs
-#### Localizationm
-- Added `_f()` macro for creating strings with translated format strings
-- Added `Gettext::getAvailableLanguages()` function
-#### System
-- Added `ProcessState` enum
-- Added `Process::pause()` method
-- Added `Process::resume()` method
+#### Localization
+- Added `_fn()` macro for creating strings with translated plural format strings
 ### Fixes
-None
+- Fixed compilation on x86 Windows
 
 ## Dependencies
 The following are a list of dependencies used by libnick. 

src/notifications/shellnotification.cpp

@@ -18,42 +18,48 @@
 using namespace Nickvision::App;
 using namespace Nickvision::System;
 
+#ifdef _WIN32
+static std::filesystem::path s_openPath;
+
+static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    if(msg == WM_TRAYICON)
+    {
+        if(lParam == NIN_BALLOONUSERCLICK)
+        {
+            if(std::filesystem::exists(s_openPath))
+            {
+                ShellExecuteA(hwnd, "open", s_openPath.string().c_str(), nullptr, nullptr, SW_SHOWDEFAULT);
+            }
+        }
+    }
+    else if(msg == WM_TIMER)
+    {
+        if(wParam == TIMER_ID)
+        {
+            KillTimer(hwnd, TIMER_ID);
+            PostQuitMessage(0);
+        }
+    }
+    else if(msg == WM_DESTROY)
+    {
+        PostQuitMessage(0);
+    }
+    return DefWindowProcA(hwnd, msg, wParam, lParam);
+}
+#endif
+
 namespace Nickvision::Notifications
 {
     void ShellNotification::send(const ShellNotificationSentEventArgs& e, const AppInfo& info, const std::string& openText)
     {
 #ifdef _WIN32
+        s_openPath = e.getAction() == "open" ? e.getActionParam() : "";
         std::thread worker{ [e, info]()
         {
-            static std::filesystem::path path{ e.getAction() == "open" ? e.getActionParam() : "" };
             std::string className{ "libnick_notification" };
             WNDCLASSA wc{};
-            wc.lpfnWndProc = +[](HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -> LRESULT
-            {
-                if(msg == WM_TRAYICON)
-                {
-                    if(lParam == NIN_BALLOONUSERCLICK)
-                    {
-                        if(std::filesystem::exists(path))
-                        {
-                            ShellExecuteA(hwnd, "open", path.string().c_str(), nullptr, nullptr, SW_SHOWDEFAULT);
-                        }
-                    }
-                }
-                else if(msg == WM_TIMER)
-                {
-                    if(wParam == TIMER_ID)
-                    {
-                        KillTimer(hwnd, TIMER_ID);
-                        PostQuitMessage(0);
-                    }
-                }
-                else if(msg == WM_DESTROY)
-                {
-                    PostQuitMessage(0);
-                }
-                return DefWindowProcA(hwnd, msg, wParam, lParam);
-            };
+            wc.lpfnWndProc = wndProc;
             wc.hInstance = GetModuleHandleA(nullptr);
             wc.lpszClassName = className.c_str();
             RegisterClassA(&wc);

tests/localizationtests.cpp

@@ -31,6 +31,12 @@ TEST(LocalizationTests, fgettext)
     ASSERT_EQ(std::string(_f("Hello {} {}", "World", count)), std::string("Hello World 1"));
 }
 
+TEST(LocalizationTests, fngettext)
+{
+    int count{ 2 };
+    ASSERT_EQ(std::string(_fn("Hello {}", "Hellos {}", count, "World")), std::string("Hellos World"));
+}
+
 TEST(LocalizationTests, pgettext)
 {
     ASSERT_EQ(std::string(_p("Test", "Hello")), std::string("Hello"));