Merge pull request microsoft#4584 from Microsoft/dbaeumer/4583

bpasero · bpasero · commit 4793a695c3e4 · 2016-03-23T06:47:09.000+01:00
Fixes Read VSCODE_NLS_CONFIG form userEnv as realy as possible
diff --git a/src/vs/workbench/electron-browser/index.html b/src/vs/workbench/electron-browser/index.html
@@ -109,6 +109,10 @@
 			var enableDeveloperTools = !configuration.isBuilt || !!configuration.extensionDevelopmentPath;
 
 			process.env['VSCODE_SHARED_IPC_HOOK'] = configuration.sharedIPCHandle;
+			// Get the nls configuration into the process.env as early as possible.
+			if (configuration.userEnv && configuration.userEnv['VSCODE_NLS_CONFIG']) {
+				process.env['VSCODE_NLS_CONFIG'] = configuration.userEnv['VSCODE_NLS_CONFIG'];
+			}
 
 			registerListeners(enableDeveloperTools);
 
