Implement /etc/locale.conf support

davispuh · davispuh · commit 80c3a87e154a · 2015-08-22T01:00:11.000+03:00
Resolves #460, fixes #365 and fixes #364
diff --git a/src/auth/Auth.cpp b/src/auth/Auth.cpp
@@ -113,7 +113,22 @@ namespace SDDM {
             , id(lastId++) {
         SocketServer::instance()->helpers[id] = this;
         QProcessEnvironment env = child->processEnvironment();
-        env.insert("LANG", "C");
+        bool langEmpty = true;
+        QFile localeFile("/etc/locale.conf");
+        if (localeFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QTextStream in(&localeFile);
+            while (!in.atEnd()) {
+                QStringList parts = in.readLine().split('=');
+                if (parts.size() >= 2) {
+                    env.insert(parts[0], parts[1]);
+                    if (parts[0] == QStringLiteral("LANG"))
+                        langEmpty = false;
+                }
+            }
+            localeFile.close();
+        }
+        if (langEmpty)
+            env.insert("LANG", "C");
         child->setProcessEnvironment(env);
         connect(child, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(childExited(int,QProcess::ExitStatus)));
         connect(child, SIGNAL(error(QProcess::ProcessError)), this, SLOT(childError(QProcess::ProcessError)));
