Merge branch 'release-6.4.0' into reg/replyDirect

RocketChat · Sep 21, 2023 · ebe25bf · ebe25bf
2 parents a40a28b + ec60dbe
commit ebe25bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/.changeset/cuddly-donkeys-remember.md b/.changeset/cuddly-donkeys-remember.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed custom translations not being displayed
diff --git a/apps/meteor/client/providers/TranslationProvider.tsx b/apps/meteor/client/providers/TranslationProvider.tsx
@@ -79,6 +79,11 @@ const useI18next = (lng: string): typeof i18next => {
 
 						if (prefix) {
 							result[key.slice(prefix.length + 1)] = value;
+							continue;
+						}
+
+						if (Array.isArray(namespaces) ? namespaces.includes('core') : namespaces === 'core') {
+							result[key] = value;
 						}
 					}
 				}