setlocale: If locale setting fails, try using C.UTF-8 as fallback

rpm-software-management · Sep 19, 2024 · 494d88f · 494d88f
1 parent 117bc3e
commit 494d88f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/dnf5/main.cpp b/dnf5/main.cpp
@@ -957,8 +957,11 @@ static void print_new_leaves(Context & context) {
 }
 
 static void set_locale() {
-    auto * locale = setlocale(LC_ALL, "");
-    if (locale) {
+    if (setlocale(LC_ALL, "")) {
+        return;
+    }
+    if (setlocale(LC_ALL, "C.UTF-8")) {
+        std::cerr << "Failed to set locale, defaulting to \"C.UTF-8\"" << std::endl;
         return;
     }
     std::cerr << "Failed to set locale, defaulting to \"C\"" << std::endl;

diff --git a/dnf5daemon-client/main.cpp b/dnf5daemon-client/main.cpp
@@ -217,10 +217,23 @@ static void add_commands(Context & context) {
 
 }  // namespace dnfdaemon::client
 
+
+static void set_locale() {
+    if (setlocale(LC_ALL, "")) {
+        return;
+    }
+    if (setlocale(LC_ALL, "C.UTF-8")) {
+        std::cerr << "Failed to set locale, defaulting to \"C.UTF-8\"" << std::endl;
+        return;
+    }
+    std::cerr << "Failed to set locale, defaulting to \"C\"" << std::endl;
+}
+
+
 int main(int argc, char * argv[]) {
     std::unique_ptr<sdbus::IConnection> connection;
 
-    setlocale(LC_ALL, "");
+    set_locale();
 
     dnfdaemon::client::Context context;