fix: use existing flag locale to the login page

Author: zhaozhiming

.github/CODEOWNERS

@@ -4,4 +4,4 @@ ci/helm-chart/ @Matthew-Beckett @alexgorbatchev
 
 docs/install.md @GNUxeava
 
-src/node/i18n/locales/zh-cn.json @zhaozhiming
+src/node/i18n/locales/zh-cn.json @zhaozhiming

src/node/cli.ts

@@ -88,7 +88,6 @@ export interface UserProvidedArgs extends UserProvidedCodeArgs {
   verbose?: boolean
   "app-name"?: string
   "welcome-text"?: string
-  lng?: string
   /* Positional arguments. */
   _?: string[]
 }
@@ -181,7 +180,14 @@ export const options: Options<Required<UserProvidedArgs>> = {
   enable: { type: "string[]" },
   help: { type: "boolean", short: "h", description: "Show this output." },
   json: { type: "boolean" },
-  locale: { type: "string" }, // The preferred way to set the locale is via the UI.
+  locale: {
+    // The preferred way to set the locale is via the UI.
+    type: "string",
+    description: `
+      Set vscode display language and language to show on the login page, more info see 
+      https://en.wikipedia.org/wiki/IETF_language_tag
+    `,
+  },
   open: { type: "boolean", description: "Open in browser on startup. Does not work remotely." },
 
   "bind-addr": {
@@ -265,13 +271,6 @@ export const options: Options<Required<UserProvidedArgs>> = {
     `,
     deprecated: true,
   },
-  lng: {
-    type: "string",
-    description: `
-      Language show on login page, more infomations to read up on
-      https://en.wikipedia.org/wiki/IETF_language_tag.
-    `,
-  },
 }
 
 export const optionDescriptions = (opts: Partial<Options<Required<UserProvidedArgs>>> = options): string[] => {

src/node/routes/login.ts

@@ -29,8 +29,8 @@ export class RateLimiter {
 
 const getRoot = async (req: Request, error?: Error): Promise<string> => {
   const content = await fs.readFile(path.join(rootPath, "src/browser/pages/login.html"), "utf8")
-  const lng = req.args["lng"] || "en"
-  i18n.changeLanguage(lng)
+  const locale = req.args["locale"] || "en"
+  i18n.changeLanguage(locale)
   const appName = req.args["app-name"] || "code-server"
   const welcomeText = req.args["welcome-text"] || (i18n.t("WELCOME", { app: appName }) as string)
   let passwordMsg = i18n.t("LOGIN_PASSWORD", { configFile: humanPath(os.homedir(), req.args.config) })

test/unit/node/cli.test.ts

@@ -70,7 +70,6 @@ describe("parser", () => {
           "--verbose",
           ["--app-name", "custom instance name"],
           ["--welcome-text", "welcome to code"],
-          ["--lng", "zh-cn"],
           "2",
 
           ["--locale", "ja"],
@@ -132,7 +131,6 @@ describe("parser", () => {
       verbose: true,
       "app-name": "custom instance name",
       "welcome-text": "welcome to code",
-      lng: "zh-cn",
       version: true,
       "bind-addr": "192.169.0.1:8080",
     })

test/unit/node/routes/login.test.ts

@@ -139,10 +139,10 @@ describe("login", () => {
       expect(htmlContent).toContain(`Welcome to ${appName}`)
     })
 
-    it("should return correct welcome text when lng is set to non-English", async () => {
+    it("should return correct welcome text when locale is set to non-English", async () => {
       process.env.PASSWORD = previousEnvPassword
-      const lng = "zh-cn"
-      const codeServer = await integration.setup([`--lng=${lng}`], "")
+      const locale = "zh-cn"
+      const codeServer = await integration.setup([`--locale=${locale}`], "")
       const resp = await codeServer.fetch("/login", { method: "GET" })
 
       const htmlContent = await resp.text()