chore(pr): address pr comments

Author: kbrownlees-csl

docker-compose.yml

@@ -16,7 +16,6 @@ services:
       DATA_DIR: '/data/tmp'
       NODE_ENV: 'production'
       REDIS_HOST: 'redis'
-      LOCALE: 'cn'
     ports:
       - '3000:3000'
     depends_on:

docs/install-server.md

@@ -47,7 +47,6 @@ some config items have to be changed:
 
 -   `local`.`storageDir` change to your directory, make sure have read/write permissions.
 -   `local`.`downloadUrl` replace `127.0.0.1` to your machine ip.
--   `local`.`locale` either `cn` or `en`.
 -   `common`.`dataDir` change to your directory,make sure have read/write permissions.
 -   `jwt`.`tokenSecret` get the random string from `https://www.grc.com/passwords.htm`, and replace the value `INSERT_RANDOM_TOKEN_KEY`.
 -   `db` config: `username`,`password`,`host`,`port` change to your own

src/app.ts

@@ -7,7 +7,7 @@ import helmet from 'helmet';
 import { logger } from 'kv-logger';
 import { AppError, NotFound } from './core/app-error';
 import { config } from './core/config';
-import { i18n } from "./core/i81n"
+import { i18n } from "./core/i18n"
 import { Req, Res, withLogger } from './core/middleware';
 import { accessKeysRouter } from './routes/accessKeys';
 import { accountRouter } from './routes/account';
@@ -32,19 +32,8 @@ app.set('views', path.join(__dirname, '../views'));
 app.set('view engine', 'pug');
 
 // translations
-
 app.use(i18n.init)
 
-app.use(function(req, res, next) {
-    // express helper for natively supported engines
-    // @ts-ignore
-    res.locals.__ = res.__ = function() {
-        return i18n.__.apply(req, arguments);
-    };
-
-    next();
-});
-
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());

src/core/config.ts

@@ -85,7 +85,6 @@ export const config = {
             'http://127.0.0.1:3000/download',
         // public static download spacename.
         public: '/download',
-        locale: process.env.LOCALE || 'cn'
     },
     jwt: {
         // Recommended: 63 random alpha-numeric characters

src/core/i81n.ts src/core/i18n.tssrc/core/i81n.ts renamed to src/core/i18n.ts

@@ -1,11 +1,8 @@
 import { I18n } from 'i18n'
 import path from "path"
-import { config } from "./config"
 
 export const i18n = new I18n({
-    locales: ['cn', 'en'],
+    locales: ['en', 'cn'],
     directory: path.join(__dirname, '../../locales'),
-    defaultLocale: 'cn'
+    defaultLocale: 'en'
 })
-
-i18n.setLocale(config.local.locale)

src/routes/index.ts

@@ -1,6 +1,6 @@
 import express from 'express';
 import { AppError } from '../core/app-error';
-import { i18n } from "../core/i81n"
+import { i18n } from "../core/i18n"
 import { checkToken, Req } from '../core/middleware';
 import { clientManager } from '../core/services/client-manager';