🛠️ Server default language (#238)

linagora · Nov 3, 2023 · 650f394 · 650f394
1 parent fbecbab
commit 650f394
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/tdrive/backend/node/config/custom-environment-variables.json b/tdrive/backend/node/config/custom-environment-variables.json
@@ -117,6 +117,7 @@
     "server": "PLUGINS_SERVER"
   },
   "drive": {
-    "rootAdmins": "DRIVE_ROOT_ADMINS"
+    "rootAdmins": "DRIVE_ROOT_ADMINS",
+    "defaultLanguage": "DRIVE_DEFAULT_LANGUAGE"
   }
 }
diff --git a/tdrive/backend/node/src/services/documents/utils.ts b/tdrive/backend/node/src/services/documents/utils.ts
@@ -12,6 +12,7 @@ import {
   writeToTemporaryFile,
 } from "../../utils/files";
 import mimes from "../../utils/mime";
+import { Configuration } from "../../core/platform/framework";
 import gr from "../global-resolver";
 import { stopWords } from "./const";
 import { DriveFile } from "./entities/drive-file";
@@ -44,8 +45,10 @@ export const isSharedWithMeFolder = (id: string) => {
 };
 
 export const getVirtualFoldersNames = async (id: string, context: DriveExecutionContext) => {
+  const configuration = new Configuration("drive");
+  const defaultLang = configuration.get<string>("defaultLanguage") || "en";
   const user = await gr.services.users.get({ id: context.user?.id });
-  const locale = user?.preferences?.locale || "en";
+  const locale = user?.preferences?.locale || defaultLang;
 
   if (id.startsWith("user_")) {
     return gr.services.i18n.translate("virtual-folder.my-drive", locale);

diff --git a/tdrive/backend/node/src/utils/users.ts b/tdrive/backend/node/src/utils/users.ts
@@ -6,13 +6,16 @@ import {
   CompanyUserStatus,
   UserObject,
 } from "../services/user/web/types";
+import { Configuration } from "../core/platform/framework";
 import gr from "../services/global-resolver";
 
 export async function formatUser(
   user: User,
   options?: { includeCompanies?: boolean },
 ): Promise<UserObject> {
   if (!user) return null;
+  const configuration = new Configuration("drive");
+  const defaultLang = configuration.get<string>("defaultLanguage") || "en";
 
   let resUser = {
     id: user.id,
@@ -69,7 +72,7 @@ export async function formatUser(
       ...resUser,
       preferences: {
         ...user.preferences,
-        locale: user.preferences?.language || user.language || "en",
+        locale: user.preferences?.language || user.language || defaultLang,
         timezone: user.preferences?.timezone || parseInt(user.timezone) || 0,
         allow_tracking: user.preferences?.allow_tracking || false,
       },