fix: 🐛 fix the extension language source

extension language now follows the app language instead of the system language
vivaxy · Feb 23, 2021 · 2909708 · 2909708
1 parent 11f7246
commit 2909708
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -10,12 +10,8 @@ import CommitProvider from './lib/editor/provider';
 
 export function activate(context: vscode.ExtensionContext) {
   output.initialize();
-  localize.initialize();
   output.appendLine('Activated');
-  output.appendLine(
-    'process.env.VSCODE_NLS_CONFIG: ' + process.env.VSCODE_NLS_CONFIG,
-  );
-  output.appendLine('vscode.env.language: ' + vscode.env.language);
+  localize.initialize();
   const disposable = vscode.commands.registerCommand(
     'extension.conventionalCommits',
     createConventionalCommits(),

diff --git a/src/lib/localize.ts b/src/lib/localize.ts
@@ -3,16 +3,20 @@
  * @author vivaxy
  */
 import * as path from 'path';
-// import * as vscode from 'vscode';
+import * as vscode from 'vscode';
+
+import * as output from './output';
 
 export let locale: string = '';
 let defaultNLS: Record<string, string> = {};
 let localeNLS: Record<string, string> = {};
 
 function getLocale() {
-  const config = JSON.parse(process.env.VSCODE_NLS_CONFIG!);
-  return config.locale;
-  // return vscode.env.language;
+  // const config = JSON.parse(process.env.VSCODE_NLS_CONFIG!);
+  // return config.locale;
+  const language = vscode.env.language;
+  output.appendLine('vscode.env.language: ' + language);
+  return language;
 }
 
 export function initialize() {