From c1b7550476ac169bf4f268b58b641facb0d4af7d Mon Sep 17 00:00:00 2001 From: Levin Li Date: Thu, 30 Mar 2023 16:58:38 +0800 Subject: [PATCH 1/2] Call bindtextdomain again after set current dir --- src/celestia/qt/qtappwin.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/celestia/qt/qtappwin.cpp b/src/celestia/qt/qtappwin.cpp index f6107a0d857..ea7c373aa59 100644 --- a/src/celestia/qt/qtappwin.cpp +++ b/src/celestia/qt/qtappwin.cpp @@ -227,6 +227,14 @@ void CelestiaAppWindow::init(const CelestiaCommandLineOptions& options) exit(1); } +#ifdef ENABLE_NLS + bindtextdomain("celestia", "locale"); + bind_textdomain_codeset("celestia", "UTF-8"); + bindtextdomain("celestia-data", "locale"); + bind_textdomain_codeset("celestia-data", "UTF-8"); + textdomain("celestia"); +#endif + // Get the config file name string configFileName; if (!options.configFileName.isEmpty()) From 18d5cdb39dba3950220700be5add0f2129a5a1f3 Mon Sep 17 00:00:00 2001 From: Levin Li Date: Thu, 30 Mar 2023 16:59:39 +0800 Subject: [PATCH 2/2] Allow SDL frontend to build without ENABLE_NLS --- src/celestia/sdl/sdlmain.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/celestia/sdl/sdlmain.cpp b/src/celestia/sdl/sdlmain.cpp index 4f86c028d98..33e21cca99c 100644 --- a/src/celestia/sdl/sdlmain.cpp +++ b/src/celestia/sdl/sdlmain.cpp @@ -653,11 +653,13 @@ sdlmain(int /* argc */, char ** /* argv */) { setlocale(LC_ALL, ""); setlocale(LC_NUMERIC, "C"); +#ifdef ENABLE_NLS bindtextdomain("celestia", LOCALEDIR); bind_textdomain_codeset("celestia", "UTF-8"); bindtextdomain("celestia-data", LOCALEDIR); bind_textdomain_codeset("celestia-data", "UTF-8"); textdomain("celestia"); +#endif const char *dataDir = getenv("CELESTIA_DATA_DIR"); if (dataDir == nullptr)