fix: encoding issue with speacial chars WPB-10340 WPB-10242 (#17892)

Co-authored-by: Immad Abdul Jabbar <[email protected]>
wireapp · Aug 12, 2024 · 07ef40d · 07ef40d
1 parent 08e8383
commit 07ef40d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/...ponents/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx b/...ponents/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx
@@ -78,20 +78,30 @@ export const EmojiPill = ({
 
   const conversationReactionCaption = () => {
     if (emojiCount > MAX_USER_NAMES_TO_SHOW) {
-      return t('conversationLikesCaptionPluralMoreThan2', {
-        number: (emojiCount - MAX_USER_NAMES_TO_SHOW).toString(),
-        userNames: reactingUserNames.join(', '),
-      });
+      return t(
+        'conversationLikesCaptionPluralMoreThan2',
+        {
+          number: (emojiCount - MAX_USER_NAMES_TO_SHOW).toString(),
+          userNames: reactingUserNames.join(', '),
+        },
+        {},
+        true,
+      );
     }
 
     if (emojiCount === MAX_USER_NAMES_TO_SHOW) {
-      return t('conversationLikesCaptionPlural', {
-        firstUser: reactingUserNames[0],
-        secondUser: reactingUserNames[1],
-      });
+      return t(
+        'conversationLikesCaptionPlural',
+        {
+          firstUser: reactingUserNames[0],
+          secondUser: reactingUserNames[1],
+        },
+        {},
+        true,
+      );
     }
 
-    return t('conversationLikesCaptionSingular', {userName: reactingUserNames?.[0] || ''});
+    return t('conversationLikesCaptionSingular', {userName: reactingUserNames?.[0] || ''}, {}, true);
   };
 
   const caption = conversationReactionCaption();

diff --git a/src/script/main/app.ts b/src/script/main/app.ts
@@ -372,7 +372,7 @@ export class App {
       const selfUser = await this.repository.user.getSelf([{position: 'App.initiateSelfUser', vendor: 'webapp'}]);
 
       await initializeDataDog(this.config, selfUser.qualifiedId);
-      onProgress(5, t('initReceivedSelfUser', selfUser.name()));
+      onProgress(5, t('initReceivedSelfUser', selfUser.name(), {}, true));
 
       try {
         await this.core.init(clientType);

diff --git a/src/script/view_model/ActionsViewModel.ts b/src/script/view_model/ActionsViewModel.ts
@@ -128,7 +128,7 @@ export class ActionsViewModel {
           text: t('modalConnectCancelSecondary'),
         },
         text: {
-          message: t('modalConnectCancelMessage', userEntity.name()),
+          message: t('modalConnectCancelMessage', userEntity.name(), {}, true),
           title: t('modalConnectCancelHeadline'),
         },
       });