From a79382228609beabfc4415d6fb73981e0c958c94 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <smalton@mirantis.com>
Date: Wed, 17 Jun 2020 15:32:21 -0400
Subject: [PATCH] add LANG env with UTF-8 specified

Signed-off-by: Sebastian Malton <smalton@mirantis.com>
---
 src/main/index.ts      |  2 +-
 src/main/shell-sync.ts | 32 ++++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/index.ts b/src/main/index.ts
index b1e43a4928..0e94fb5226 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -34,7 +34,7 @@ const vmURL = (isDevelopment) ? `http://localhost:${process.env.ELECTRON_WEBPACK
 })
 
 async function main() {
-  await shellSync()
+  shellSync(app.getLocale())
 
   const updater = new AppUpdater()
   updater.start();
diff --git a/src/main/shell-sync.ts b/src/main/shell-sync.ts
index 39845c7b01..5a44f4b362 100644
--- a/src/main/shell-sync.ts
+++ b/src/main/shell-sync.ts
@@ -1,18 +1,34 @@
 import shellEnv = require("shell-env")
 import logger from "./logger"
+import * as os from "os";
 
-export async function shellSync() {
-  const env = await shellEnv()
+interface Env {
+  [key: string]: string;
+}
+
+/**
+ * shellSync loads what would have been the environment if this application was
+ * run from the command line, into the process.env object. This is especially
+ * useful on macos where this always needs to be done.
+ * @param locale Should be electron's `app.getLocale()`
+ */
+export function shellSync(locale: string) {
+  const { shell } = os.userInfo();
+  const env: Env = JSON.parse(JSON.stringify(shellEnv.sync(shell)))
+  if (!env.LANG) {
+    // the LANG env var expects an underscore instead of electron's dash
+    env.LANG = `${locale.replace('-', '_')}.UTF-8`;
+  } else if (!env.LANG.endsWith(".UTF-8")) {
+    env.LANG += ".UTF-8"
+  }
 
   // Overwrite PATH on darwin
   if (process.env.NODE_ENV === "production" && process.platform === "darwin") {
     process.env["PATH"] = env.PATH
   }
 
-  let key = null
-  for(key in env) {
-    if(!env.hasOwnProperty(key) || process.env[key]) continue // skip existing and prototype keys
-    logger.debug("Imported " + key + " from login shell to process environment")
-    process.env[key] = env[key]
-  }
+  process.env = {
+    ...process.env,
+    ...env
+  };
 }