From baafbc5d7716683e74dc3ecb5298b0322e9eca85 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sun, 25 May 2025 23:00:25 +0200 Subject: gui: prepare locale reintroduction --- gui/CMakeLists.txt | 5 +++++ gui/src/main.cpp | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 995b288..5222efa 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -31,6 +31,10 @@ glib_add_resources("resources" "metainfo.xml" ) +target_compile_definitions("resources" PUBLIC + "LOCALEDIR=\"$,${CMAKE_INSTALL_FULL_LOCALEDIR},${CMAKE_CURRENT_BINARY_DIR}/$>\"" +) + # Application add_executable("gui" "src/main.cpp") @@ -63,6 +67,7 @@ set_target_properties("gui" PROPERTIES CXX_EXTENSIONS OFF ) + configure_file("desktop.in" "ch.arknet.Turns.desktop") configure_file("metainfo.xml" "ch.arknet.Turns.metainfo.xml") configure_file("mime.xml" "ch.arknet.Turns.xml") diff --git a/gui/src/main.cpp b/gui/src/main.cpp index dec6b8c..a4dd2ae 100644 --- a/gui/src/main.cpp +++ b/gui/src/main.cpp @@ -7,8 +7,17 @@ #include +#include + +#include + auto main(int argc, char ** argv) -> int { + setlocale(LC_ALL, ""); + bindtextdomain("turns", LOCALEDIR); + bind_textdomain_codeset("turns", "UTF-8"); + textdomain("turns"); + auto app = Adwaita::Application::create("ch.arknet.Turns", Gio::Application::Flags::HANDLES_OPEN); return app->run(argc, argv); @@ -50,10 +59,6 @@ auto main(int argc, char ** argv) -> int // auto main(int argc, char * argv[]) -> int // { -// setlocale(LC_ALL, ""); -// bindtextdomain("turns", LOCALEDIR); -// bind_textdomain_codeset("turns", "UTF-8"); -// textdomain("turns"); // auto app = Adwaita::Application::create("ch.arknet.Turns", Gio::Application::Flags::HANDLES_OPEN); // auto settings = turns::core::get_settings(); -- cgit v1.2.3