From fbecbab15543a15ee9a32320c5058570fbf4b962 Mon Sep 17 00:00:00 2001
From: Montassar Ghanmy <Monta.ghanmy@gmail.com>
Date: Thu, 2 Nov 2023 14:43:07 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20User=20language=20sync=20(#237)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tdrive/backend/node/src/services/console/clients/remote.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tdrive/backend/node/src/services/console/clients/remote.ts b/tdrive/backend/node/src/services/console/clients/remote.ts
index 7ff31922..cd13505b 100644
--- a/tdrive/backend/node/src/services/console/clients/remote.ts
+++ b/tdrive/backend/node/src/services/console/clients/remote.ts
@@ -148,7 +148,9 @@ export class ConsoleRemoteClient implements ConsoleServiceClient {
         userDTO.preference.allowTrackingPersonalInfo,
         user.preferences?.allow_tracking,
       );
-      user.preferences.language = coalesce(userDTO.preference.locale, user.preferences?.language);
+      if (!user.preferences.language) {
+        user.preferences.language = coalesce(userDTO.preference.locale, user.preferences?.language);
+      }
       user.preferences.timezone = coalesce(userDTO.preference.timeZone, user.preferences?.timezone);
     }