diff --git a/server/db/models/AppSettings.js b/server/db/models/AppSettings.js index 26ba6f254..6415b229d 100755 --- a/server/db/models/AppSettings.js +++ b/server/db/models/AppSettings.js @@ -7,10 +7,6 @@ const AppSettingsSchema = mongoose.Schema( required: true, default: "http://localhost:5000/api/v1", }, - language: { - type: String, - default: "en", - }, logLevel: { type: String, default: "debug", diff --git a/server/middleware/languageMiddleware.js b/server/middleware/languageMiddleware.js index fd32ee818..1449e203f 100755 --- a/server/middleware/languageMiddleware.js +++ b/server/middleware/languageMiddleware.js @@ -1,16 +1,10 @@ import logger from "../utils/logger.js"; const languageMiddleware = - (stringService, translationService, settingsService) => async (req, res, next) => { + (stringService, translationService) => async (req, res, next) => { try { - const settings = await settingsService.getSettings(); - - let language = settings && settings.language ? settings.language : null; - - if (!language) { - const acceptLanguage = req.headers["accept-language"] || "en"; - language = acceptLanguage.split(",")[0].slice(0, 2).toLowerCase(); - } + const acceptLanguage = req.headers["accept-language"] || "en"; + const language = acceptLanguage.split(",")[0].slice(0, 2).toLowerCase(); translationService.setLanguage(language); stringService.setLanguage(language); diff --git a/server/service/settingsService.js b/server/service/settingsService.js index 1443755f9..6c7beb456 100755 --- a/server/service/settingsService.js +++ b/server/service/settingsService.js @@ -3,7 +3,6 @@ import dotenv from "dotenv"; dotenv.config(); const envConfig = { logLevel: process.env.LOG_LEVEL, - language: process.env.LANGUAGE, clientHost: process.env.CLIENT_HOST, jwtSecret: process.env.JWT_SECRET, dbType: process.env.DB_TYPE,