coder · foxsir · Aug 6, 2019 · Aug 6, 2019 · Aug 6, 2019 · Aug 6, 2019
diff --git a/README.md b/README.md
@@ -1,8 +1,13 @@
-# code-server [!["Open Issues"](https://img.shields.io/github/issues-raw/cdr/code-server.svg)](https://github.com/cdr/code-server/issues) [!["Latest Release"](https://img.shields.io/github/release/cdr/code-server.svg)](https://github.com/cdr/code-server/releases/latest) [![MIT license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cdr/code-server/blob/master/LICENSE) [![Discord](https://img.shields.io/discord/463752820026376202.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/zxSwN8Z)
+# code-server
 
-**code-server v2 is almost out!**
-[Get the preview here](https://github.com/cdr/code-server/releases).
-(Linux builds only at the moment.)
+
+修复语言包支持 （Fix language support）
+需要安装于vscode相匹配的语言包版本，如果通过左侧扩展栏安装出现错误，请下载对应的 MS-CEINTL.vscode-language-pack-zh-hans-1.xx.x.vsix 文件 通过 shift+command (ctrl)+P 安装vsix文件
+
+[!["Open Issues"](https://img.shields.io/github/issues-raw/cdr/code-server.svg)](https://github.com/cdr/code-server/issues)
+[!["Latest Release"](https://img.shields.io/github/release/cdr/code-server.svg)](https://github.com/cdr/code-server/releases/latest)
+[![MIT license](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/cdr/code-server/blob/master/LICENSE)
+[![Discord](https://img.shields.io/discord/463752820026376202.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/zxSwN8Z)
 
 `code-server` is [VS Code](https://github.com/Microsoft/vscode) running on a remote server, accessible through the browser.
 

diff --git a/doc/assets/ide.png b/doc/assets/ide.png
diff --git a/packages/protocol/src/browser/client.ts b/packages/protocol/src/browser/client.ts
@@ -281,6 +281,7 @@ export class Client {
 					extraExtensionDirectories: init.getExtraExtensionDirectoriesList(),
 					extraBuiltinExtensionDirectories: init.getExtraBuiltinExtensionDirectoriesList(),
 					env: init.getEnvMap(),
+					languageTranslateData: init.getLanguageTranslateData(), // @www.ps.dev
 				};
 				this.initDataEmitter.emit(this._initData);
 				break;

diff --git a/packages/protocol/src/common/connection.ts b/packages/protocol/src/common/connection.ts
@@ -30,6 +30,8 @@ export interface InitData {
 	readonly extraExtensionDirectories: string[];
 	readonly extraBuiltinExtensionDirectories: string[];
 	readonly env: jspb.Map<string, string>;
+	// @www.ps.dev
+	readonly languageTranslateData: string;
 }
 
 export interface SharedProcessData {

diff --git a/packages/protocol/src/node/server.ts b/packages/protocol/src/node/server.ts
@@ -9,6 +9,11 @@ import { ChildProcessModuleProxy, ForkProvider, FsModuleProxy, NetModuleProxy, N
 
 // tslint:disable no-any
 
+// @www.ps.dev
+export interface LanguageConfiguration {
+	locale: string;
+}
+
 export interface ServerOptions {
 	readonly workingDirectory: string;
 	readonly dataDirectory: string;
@@ -18,6 +23,7 @@ export interface ServerOptions {
 	readonly extraExtensionDirectories?: string[];
 	readonly extraBuiltinExtensionDirectories?: string[];
 	readonly fork?: ForkProvider;
+	readonly getLanguageTranslateData?: () => Promise<LanguageConfiguration>; // @www.ps.dev
 }
 
 interface ProxyData {
@@ -104,13 +110,35 @@ export class Server {
 		initMsg.setExtraExtensionDirectoriesList(this.options.extraExtensionDirectories || []);
 		initMsg.setExtraBuiltinExtensionDirectoriesList(this.options.extraBuiltinExtensionDirectories || []);
 
+		// @www.ps.dev
+		const getLanguageTranslateData = this.options.getLanguageTranslateData
+			|| ((): Promise<LanguageConfiguration> => Promise.resolve({
+				locale: "en",
+			}));
+
+		getLanguageTranslateData().then((languageData) => {
+			try {
+				initMsg.setLanguageTranslateData(JSON.stringify(languageData));
+			} catch (error) {
+				logger.error("Unable to send language config", field("error", error));
+			}
+
+			const srvMsg = new ServerMessage();
+			srvMsg.setInit(initMsg);
+			connection.send(srvMsg.serializeBinary());
+		}).catch((error) => {
+			logger.error(error.message, field("error", error));
+		});
+		// end @www.ps.dev
+
 		for (let key in process.env) {
 			initMsg.getEnvMap().set(key,  process.env[key] as string);
 		}
 
-		const srvMsg = new ServerMessage();
-		srvMsg.setInit(initMsg);
-		connection.send(srvMsg.serializeBinary());
+		// @www.ps.dev move in getLanguageTranslateData 👆
+		// const srvMsg = new ServerMessage();
+		// srvMsg.setInit(initMsg);
+		// connection.send(srvMsg.serializeBinary());
 	}
 
 	/**

diff --git a/packages/protocol/src/proto/client.proto b/packages/protocol/src/proto/client.proto
@@ -46,4 +46,7 @@ message WorkingInit {
 	repeated string extra_builtin_extension_directories = 10;
 
 	map<string, string> env = 11;
+
+	// @www.ps.dev
+    string language_translate_data = 12;
 }
diff --git a/packages/protocol/src/proto/client_pb.d.ts b/packages/protocol/src/proto/client_pb.d.ts
@@ -147,6 +147,9 @@ export class WorkingInit extends jspb.Message {
 
   getEnvMap(): jspb.Map<string, string>;
   clearEnvMap(): void;
+  getLanguageTranslateData(): string;
+  setLanguageTranslateData(value: string): void;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): WorkingInit.AsObject;
   static toObject(includeInstance: boolean, msg: WorkingInit): WorkingInit.AsObject;
@@ -170,6 +173,7 @@ export namespace WorkingInit {
     extraExtensionDirectoriesList: Array<string>,
     extraBuiltinExtensionDirectoriesList: Array<string>,
     envMap: Array<[string, string]>,
+    languageTranslateData: string,
   }
 
   export enum OperatingSystem {