Moving logic to inside the _getLangEnvVariable function

matheusrocha89 · matheusrocha89 · commit 23578428bcdb · 2017-02-20T17:53:13.000-03:00
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -562,16 +562,11 @@ export class TerminalInstance implements ITerminalInstance {
 			});
 		}
 		env['PTYCWD'] = cwd;
-		if (locale) {
-			env['LANG'] = TerminalInstance._getLangEnvVariable(locale);
-		}
+		env['LANG'] = TerminalInstance._getLangEnvVariable(locale);
 		if (cols && rows) {
 			env['PTYCOLS'] = cols.toString();
 			env['PTYROWS'] = rows.toString();
 		}
-		if (!env['LANG']) {
-			env['LANG'] = 'en_US.UTF-8'; // Avoid encoding problem with special chars. Issue #14586
-		}
 		return env;
 	}
 
@@ -618,12 +613,12 @@ export class TerminalInstance implements ITerminalInstance {
 		return newEnv;
 	}
 
-	private static _getLangEnvVariable(locale: string) {
-		const parts = locale.split('-');
+	private static _getLangEnvVariable(locale?: string) {
+		const parts = locale ? locale.split('-') : [];
 		const n = parts.length;
 		const language = parts[0];
 		if (n === 0) {
-			return '';
+			return 'en_US.UTF-8'; // Avoid encoding problem with special chars. Issue #14586
 		}
 		if (n === 1) {
 			// app.getLocale can return just a language without a variant, fill in the variant for
