From c05dcf45f2c9cd5fcbff39daa76f1b94b002952f Mon Sep 17 00:00:00 2001
From: Maksim Eltyshev <meltyshev@gmail.com>
Date: Wed, 21 May 2025 13:03:25 +0200
Subject: [PATCH] feat: Enhance notifications popup appearance

---
 client/src/api/notifications.js                    |  3 +++
 .../activities/Activities/Item.module.scss         |  2 --
 .../notifications/NotificationsStep/Item.jsx       | 14 ++++++++++----
 .../NotificationsStep/Item.module.scss             | 13 ++++++++++++-
 client/src/locales/ar-YE/core.js                   |  5 +++--
 client/src/locales/bg-BG/core.js                   |  5 +++--
 client/src/locales/cs-CZ/core.js                   | 11 +++++++----
 client/src/locales/da-DK/core.js                   |  5 +++--
 client/src/locales/de-DE/core.js                   |  4 ++--
 client/src/locales/en-GB/core.js                   |  8 +++++---
 client/src/locales/en-US/core.js                   |  8 +++++---
 client/src/locales/es-ES/core.js                   |  5 +++--
 client/src/locales/fa-IR/core.js                   |  5 +++--
 client/src/locales/fr-FR/core.js                   |  8 ++++----
 client/src/locales/hu-HU/core.js                   |  4 ++--
 client/src/locales/id-ID/core.js                   |  4 ++--
 client/src/locales/it-IT/core.js                   |  4 ++--
 client/src/locales/ja-JP/core.js                   |  6 +++---
 client/src/locales/ko-KR/core.js                   |  5 +++--
 client/src/locales/nl-NL/core.js                   |  4 ++--
 client/src/locales/pl-PL/core.js                   |  5 +++--
 client/src/locales/pt-BR/core.js                   |  5 +++--
 client/src/locales/ro-RO/core.js                   |  4 ++--
 client/src/locales/ru-RU/core.js                   |  5 +++--
 client/src/locales/sk-SK/core.js                   |  6 ++++--
 client/src/locales/sr-Cyrl-CS/core.js              |  5 +++--
 client/src/locales/sr-Latn-CS/core.js              |  5 +++--
 client/src/locales/sv-SE/core.js                   |  5 +++--
 client/src/locales/tr-TR/core.js                   |  4 ++--
 client/src/locales/uk-UA/core.js                   |  4 ++--
 client/src/locales/uz-UZ/core.js                   |  5 +++--
 client/src/locales/zh-CN/core.js                   |  4 ++--
 client/src/locales/zh-TW/core.js                   |  4 ++--
 33 files changed, 112 insertions(+), 72 deletions(-)

diff --git a/client/src/api/notifications.js b/client/src/api/notifications.js
index b0456229..6d36332a 100755
--- a/client/src/api/notifications.js
+++ b/client/src/api/notifications.js
@@ -16,6 +16,9 @@ export const transformNotification = (notification) => ({
         activityId: notification.actionId,
       }
     : notification),
+  ...(notification.createdAt && {
+    createdAt: new Date(notification.createdAt),
+  }),
 });
 
 /* Actions */
diff --git a/client/src/components/activities/Activities/Item.module.scss b/client/src/components/activities/Activities/Item.module.scss
index 37c92a31..7245597b 100644
--- a/client/src/components/activities/Activities/Item.module.scss
+++ b/client/src/components/activities/Activities/Item.module.scss
@@ -6,7 +6,6 @@
 :global(#app) {
   .author {
     color: #17394d;
-    display: inline-block;
     font-weight: bold;
     line-height: 20px;
   }
@@ -21,7 +20,6 @@
 
   .date {
     color: #6b808c;
-    display: inline-block;
     font-size: 12px;
     line-height: 20px;
   }
diff --git a/client/src/components/notifications/NotificationsStep/Item.jsx b/client/src/components/notifications/NotificationsStep/Item.jsx
index 69c65b5b..ac424ab2 100644
--- a/client/src/components/notifications/NotificationsStep/Item.jsx
+++ b/client/src/components/notifications/NotificationsStep/Item.jsx
@@ -16,6 +16,7 @@ import entryActions from '../../../entry-actions';
 import Paths from '../../../constants/Paths';
 import { StaticUserIds } from '../../../constants/StaticUsers';
 import { NotificationTypes } from '../../../constants/Enums';
+import TimeAgo from '../../common/TimeAgo';
 import UserAvatar from '../../users/UserAvatar';
 
 import styles from './Item.module.scss';
@@ -67,7 +68,7 @@ const Item = React.memo(({ id, onClose }) => {
             toList: toListName,
           }}
         >
-          {creatorUserName}
+          <span className={styles.author}>{creatorUserName}</span>
           {' moved '}
           <Link to={Paths.CARDS.replace(':id', notification.cardId)} onClick={onClose}>
             {cardName}
@@ -93,7 +94,7 @@ const Item = React.memo(({ id, onClose }) => {
             card: cardName,
           }}
         >
-          {creatorUserName}
+          <span className={styles.author}>{creatorUserName}</span>
           {` left a new comment «${commentText}» to `}
           <Link to={Paths.CARDS.replace(':id', notification.cardId)} onClick={onClose}>
             {cardName}
@@ -112,7 +113,7 @@ const Item = React.memo(({ id, onClose }) => {
             card: cardName,
           }}
         >
-          {creatorUserName}
+          <span className={styles.author}>{creatorUserName}</span>
           {` added you to `}
           <Link to={Paths.CARDS.replace(':id', notification.cardId)} onClick={onClose}>
             {cardName}
@@ -128,7 +129,12 @@ const Item = React.memo(({ id, onClose }) => {
   return (
     <div className={styles.wrapper}>
       <UserAvatar id={notification.creatorUserId} size="large" />
-      <span className={styles.content}>{contentNode}</span>
+      <span className={styles.content}>
+        <div>{contentNode}</div>
+        <span className={styles.date}>
+          <TimeAgo date={notification.createdAt} />
+        </span>
+      </span>
       <Button
         type="button"
         icon="trash alternate outline"
diff --git a/client/src/components/notifications/NotificationsStep/Item.module.scss b/client/src/components/notifications/NotificationsStep/Item.module.scss
index 21cea16c..b9358e9f 100644
--- a/client/src/components/notifications/NotificationsStep/Item.module.scss
+++ b/client/src/components/notifications/NotificationsStep/Item.module.scss
@@ -4,6 +4,11 @@
  */
 
 :global(#app) {
+  .author {
+    color: #17394d;
+    font-weight: bold;
+  }
+
   .button {
     background: transparent;
     box-shadow: none;
@@ -23,7 +28,7 @@
 
   .content {
     display: inline-block;
-    font-size: 12px;
+    font-size: 13px;
     min-height: 36px;
     overflow: hidden;
     padding: 0 4px 0 8px;
@@ -32,6 +37,12 @@
     word-break: break-word;
   }
 
+  .date {
+    color: #6b808c;
+    font-size: 12px;
+    line-height: 20px;
+  }
+
   .wrapper {
     padding: 12px;
 
diff --git a/client/src/locales/ar-YE/core.js b/client/src/locales/ar-YE/core.js
index 89635082..a2b52b17 100644
--- a/client/src/locales/ar-YE/core.js
+++ b/client/src/locales/ar-YE/core.js
@@ -153,8 +153,9 @@ export default {
       title: 'العنوان',
       userActions_title: 'إجراءات المستخدم',
       userAddedThisCardToList: '<0>{{user}}</0><1> تمت إضافة هذه البطاقة إلى {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} ترك تعليق جديد «{{comment}}» إلى <2>{{card}}</2>',
-      userMovedCardFromListToList: '{{user}} انتقل <2>{{card}}</2> من {{fromList}} إلى {{toList}}',
+      userLeftNewCommentToCard: '<0>{{user}}</0> ترك تعليق جديد «{{comment}}» إلى <2>{{card}}</2>',
+      userMovedCardFromListToList:
+        '<0>{{user}}</0> انتقل <2>{{card}}</2> من {{fromList}} إلى {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> نُقلت هذه البطاقة من {{fromList}} إلى {{toList}}</1>',
       username: 'اسم المستخدم',
diff --git a/client/src/locales/bg-BG/core.js b/client/src/locales/bg-BG/core.js
index fb41911c..82bc7b41 100644
--- a/client/src/locales/bg-BG/core.js
+++ b/client/src/locales/bg-BG/core.js
@@ -154,9 +154,10 @@ export default {
       title: 'Заглавие',
       userActions_title: 'Потребителски действия',
       userAddedThisCardToList: '<0>{{user}}</0><1> добави тази карта в {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} остави нов коментар «{{comment}}» в <2>{{card}}</2>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> остави нов коментар «{{comment}}» в <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} премести <2>{{card}}</2> от {{fromList}} към {{toList}}',
+        '<0>{{user}}</0> премести <2>{{card}}</2> от {{fromList}} към {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> премести тази карта от {{fromList}} към {{toList}}</1>',
       username: 'Потребителско име',
diff --git a/client/src/locales/cs-CZ/core.js b/client/src/locales/cs-CZ/core.js
index 3fdfd8c7..5001995c 100644
--- a/client/src/locales/cs-CZ/core.js
+++ b/client/src/locales/cs-CZ/core.js
@@ -276,10 +276,13 @@ export default {
       unsavedChanges: 'Neuložené změny',
       uploadedImages: 'Nahrané obrázky',
       userActions_title: 'Akce uživatele',
-      userAddedThisCardToList: '{{user}} přidal kartu do {{list}}',
-      userLeftNewCommentToCard: '{{user}} zanechal nový komentář «{{comment}}» k {{card}}',
-      userMovedCardFromListToList: '{{user}} přesunul {{card}} z {{fromList}} do {{toList}}',
-      userMovedThisCardFromListToList: '{{user}} přesunul tuto kartu z {{fromList}} do {{toList}}',
+      userAddedThisCardToList: '<0>{{user}}</0><1> přidal kartu do {{list}}</1>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> zanechal nový komentář «{{comment}}» k <2>{{card}}</2>',
+      userMovedCardFromListToList:
+        '<0>{{user}}</0> přesunul <2>{{card}}</2> z {{fromList}} do {{toList}}',
+      userMovedThisCardFromListToList:
+        '<0>{{user}}</0><1> přesunul tuto kartu z {{fromList}} do {{toList}}</1>',
       username: 'Uživatelské jméno',
       users: 'Uživatelé',
       viewer: 'Prohlížeč',
diff --git a/client/src/locales/da-DK/core.js b/client/src/locales/da-DK/core.js
index c8d9d922..508b726a 100644
--- a/client/src/locales/da-DK/core.js
+++ b/client/src/locales/da-DK/core.js
@@ -155,9 +155,10 @@ export default {
       title: 'Overskrift',
       userActions_title: 'Brugerhandlinger',
       userAddedThisCardToList: '<0>{{user}}</0><1> tilføjede kortet til {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} skrevet en ny kommentar «{{comment}}» på <2>{{card}}</2>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> skrevet en ny kommentar «{{comment}}» på <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} flyttede <2>{{card}}</2> fra {{fromList}} til {{toList}}',
+        '<0>{{user}}</0> flyttede <2>{{card}}</2> fra {{fromList}} til {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> flyttede kortet fra {{fromList}} til {{toList}}</1>',
       username: 'Brugernavn',
diff --git a/client/src/locales/de-DE/core.js b/client/src/locales/de-DE/core.js
index 022e3ffc..57ff436e 100644
--- a/client/src/locales/de-DE/core.js
+++ b/client/src/locales/de-DE/core.js
@@ -298,9 +298,9 @@ export default {
       userActions_title: 'Benutzeraktionen',
       userAddedThisCardToList: '<0>{{user}}</0><1> hat diese Karte hinzugefügt zu {{list}}</1>',
       userLeftNewCommentToCard:
-        '{{user}} hat einen neuen Kommentar verfasst: «{{comment}}» in <2>{{card}}</2>',
+        '<0>{{user}}</0> hat einen neuen Kommentar verfasst: «{{comment}}» in <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} bewegte <2>{{card}}</2> von {{fromList}} nach {{toList}}',
+        '<0>{{user}}</0> bewegte <2>{{card}}</2> von {{fromList}} nach {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> bewegte diese Karte von {{fromList}} nach {{toList}}</1>',
       username: 'Benutzername',
diff --git a/client/src/locales/en-GB/core.js b/client/src/locales/en-GB/core.js
index 2cb913e3..0be9ccb0 100644
--- a/client/src/locales/en-GB/core.js
+++ b/client/src/locales/en-GB/core.js
@@ -288,14 +288,16 @@ export default {
       userActions_title: 'User Actions',
       userAddedThisCardToList: '<0>{{user}}</0><1> added this card to {{list}}</1>',
       userAddedUserToThisCard: '<0>{{actorUser}}</0><1> added {{addedUser}} to this card</1>',
-      userAddedYouToCard: '{{user}} added you to <2>{{card}}</2>',
+      userAddedYouToCard: '<0>{{user}}</0> added you to <2>{{card}}</2>',
       userCompletedTaskOnThisCard: '<0>{{user}}</0><1> completed {{task}} on this card</1>',
       userJoinedThisCard: `<0>{{user}}</0><1> joined this card</1>`,
-      userLeftNewCommentToCard: '{{user}} left a new comment «{{comment}}» to <2>{{card}}</2>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> left a new comment «{{comment}}» to <2>{{card}}</2>',
       userLeftThisCard: '<0>{{user}}</0><1> left this card</1>',
       userMarkedTaskIncompleteOnThisCard:
         '<0>{{user}}</0><1> marked {{task}} incomplete on this card</1>',
-      userMovedCardFromListToList: '{{user}} moved <2>{{card}}</2> from {{fromList}} to {{toList}}',
+      userMovedCardFromListToList:
+        '<0>{{user}}</0> moved <2>{{card}}</2> from {{fromList}} to {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> moved this card from {{fromList}} to {{toList}}</1>',
       userRemovedUserFromThisCard:
diff --git a/client/src/locales/en-US/core.js b/client/src/locales/en-US/core.js
index 28cae078..cc858c3c 100644
--- a/client/src/locales/en-US/core.js
+++ b/client/src/locales/en-US/core.js
@@ -283,14 +283,16 @@ export default {
       userActions_title: 'User Actions',
       userAddedThisCardToList: '<0>{{user}}</0><1> added this card to {{list}}</1>',
       userAddedUserToThisCard: '<0>{{actorUser}}</0><1> added {{addedUser}} to this card</1>',
-      userAddedYouToCard: '{{user}} added you to <2>{{card}}</2>',
+      userAddedYouToCard: '<0>{{user}}</0> added you to <2>{{card}}</2>',
       userCompletedTaskOnThisCard: '<0>{{user}}</0><1> completed {{task}} on this card</1>',
       userJoinedThisCard: `<0>{{user}}</0><1> joined this card</1>`,
-      userLeftNewCommentToCard: '{{user}} left a new comment «{{comment}}» to <2>{{card}}</2>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> left a new comment «{{comment}}» to <2>{{card}}</2>',
       userLeftThisCard: '<0>{{user}}</0><1> left this card</1>',
       userMarkedTaskIncompleteOnThisCard:
         '<0>{{user}}</0><1> marked {{task}} incomplete on this card</1>',
-      userMovedCardFromListToList: '{{user}} moved <2>{{card}}</2> from {{fromList}} to {{toList}}',
+      userMovedCardFromListToList:
+        '<0>{{user}}</0> moved <2>{{card}}</2> from {{fromList}} to {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> moved this card from {{fromList}} to {{toList}}</1>',
       userRemovedUserFromThisCard:
diff --git a/client/src/locales/es-ES/core.js b/client/src/locales/es-ES/core.js
index 4fbc3bfe..41bb79e2 100644
--- a/client/src/locales/es-ES/core.js
+++ b/client/src/locales/es-ES/core.js
@@ -119,8 +119,9 @@ export default {
       userActions_title: 'Acciones de Usuario',
       userAddedThisCardToList: '<0>{{user}}</0><1> añadido a esta tarjeta en {{list}}</1>',
       userLeftNewCommentToCard:
-        '{{user}} dejó un nuevo comentario «{{comment}}» en <2>{{card}}</2>',
-      userMovedCardFromListToList: '{{user}} movió <2>{{card}}</2> de {{fromList}} a {{toList}}',
+        '<0>{{user}}</0> dejó un nuevo comentario «{{comment}}» en <2>{{card}}</2>',
+      userMovedCardFromListToList:
+        '<0>{{user}}</0> movió <2>{{card}}</2> de {{fromList}} a {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> movió esta tarjeta de {{fromList}} a {{toList}}</1>',
       username: 'Nombre de usuario',
diff --git a/client/src/locales/fa-IR/core.js b/client/src/locales/fa-IR/core.js
index c0a42211..795ca8e0 100644
--- a/client/src/locales/fa-IR/core.js
+++ b/client/src/locales/fa-IR/core.js
@@ -154,9 +154,10 @@ export default {
       title: 'عنوان',
       userActions_title: 'اقدامات کاربر',
       userAddedThisCardToList: '<0>{{user}}</0><1> این کارت را به {{list}} اضافه کرد</1>',
-      userLeftNewCommentToCard: '{{user}} نظر جدید «{{comment}}» را به <2>{{card}}</2> اضافه کرد',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> نظر جدید «{{comment}}» را به <2>{{card}}</2> اضافه کرد',
       userMovedCardFromListToList:
-        '{{user}} <2>{{card}}</2> را از {{fromList}} به {{toList}} منتقل کرد',
+        '<0>{{user}}</0> <2>{{card}}</2> را از {{fromList}} به {{toList}} منتقل کرد',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> این کارت را از {{fromList}} به {{toList}} منتقل کرد</1>',
       username: 'نام کاربری',
diff --git a/client/src/locales/fr-FR/core.js b/client/src/locales/fr-FR/core.js
index ea8e8e6f..74356971 100644
--- a/client/src/locales/fr-FR/core.js
+++ b/client/src/locales/fr-FR/core.js
@@ -153,13 +153,13 @@ export default {
       time: 'Temps',
       title: 'Titre',
       userActions_title: "Actions de l'utilisateur",
-      userAddedThisCardToList: '<0> {{user}} </0> <1> a ajouté cette carte à {{list}} </1>',
+      userAddedThisCardToList: '<0>{{user}}</0><1> a ajouté cette carte à {{list}}</1>',
       userLeftNewCommentToCard:
-        '{{user}} a laissé un nouveau commentaire {{comment}} à <2> {{card}} </2>',
+        '<0>{{user}}</0> a laissé un nouveau commentaire {{comment}} à <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} a déplacé <2> {{card}} </2> de {{fromList}} vers {{toList}}',
+        '<0>{{user}}</0> a déplacé <2>{{card}}</2> de {{fromList}} vers {{toList}}',
       userMovedThisCardFromListToList:
-        '<0> {{user}} </0> <1> a déplacé cette carte de {{fromList}} vers {{toList}} </1>',
+        '<0>{{user}}</0><1> a déplacé cette carte de {{fromList}} vers {{toList}}</1>',
       username: "Nom d'utilisateur",
       users: 'Utilisateurs',
       viewer: 'Spectateur',
diff --git a/client/src/locales/hu-HU/core.js b/client/src/locales/hu-HU/core.js
index 33254a57..6f9fe79b 100644
--- a/client/src/locales/hu-HU/core.js
+++ b/client/src/locales/hu-HU/core.js
@@ -154,9 +154,9 @@ export default {
       userAddedThisCardToList:
         '<0>{{user}}</0><1> hozzáadta ezt a kártyát a következőhöz: {{list}}</1>',
       userLeftNewCommentToCard:
-        '{{user}} új kommentet hagyott itt: «{{comment}}» a következő kártyán: <2>{{card}}</2>',
+        '<0>{{user}}</0> új kommentet hagyott itt: «{{comment}}» a következő kártyán: <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} áthelyezte ezt a kártyát innen: {{fromList}} ide: {{toList}}',
+        '<0>{{user}}</0> áthelyezte ezt a kártyát innen: {{fromList}} ide: {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> áthelyezte ezt a kártyát innen: {{fromList}} ide: {{toList}}</1>',
       username: 'Felhasználónév',
diff --git a/client/src/locales/id-ID/core.js b/client/src/locales/id-ID/core.js
index 81550eef..0c064f40 100644
--- a/client/src/locales/id-ID/core.js
+++ b/client/src/locales/id-ID/core.js
@@ -148,9 +148,9 @@ export default {
       title: 'Judul',
       userActions_title: 'Aksi Pengguna',
       userAddedThisCardToList: '<0>{{user}}</0><1> menambahkan kartu ini ke {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} mengomentari «{{comment}}» di <2>{{card}}</2>',
+      userLeftNewCommentToCard: '<0>{{user}}</0> mengomentari «{{comment}}» di <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} memindahkan <2>{{card}}</2> dari {{fromList}} ke {{toList}}',
+        '<0>{{user}}</0> memindahkan <2>{{card}}</2> dari {{fromList}} ke {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> memindahkan kartu ini dari {{fromList}} ke {{toList}}</1>',
       username: 'Username',
diff --git a/client/src/locales/it-IT/core.js b/client/src/locales/it-IT/core.js
index 4df38ea7..21e3bb44 100644
--- a/client/src/locales/it-IT/core.js
+++ b/client/src/locales/it-IT/core.js
@@ -286,9 +286,9 @@ export default {
       userActions_title: 'Azioni utente',
       userAddedThisCardToList: '<0>{{user}}</0><1> ha aggiunto questa scheda a {{list}}</1>',
       userLeftNewCommentToCard:
-        '{{user}} ha lasciato un commento «{{comment}}» a <2>{{scheda}}</2>',
+        '<0>{{user}}</0> ha lasciato un commento «{{comment}}» a <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} ha spostato <2>{{scheda}}</2> da {{fromList}} a {{toList}}',
+        '<0>{{user}}</0> ha spostato <2>{{card}}</2> da {{fromList}} a {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> ha spostato questa scheda da {{fromList}} a {{toList}}</1>',
       username: 'Username',
diff --git a/client/src/locales/ja-JP/core.js b/client/src/locales/ja-JP/core.js
index c87b60b2..d6946dcb 100644
--- a/client/src/locales/ja-JP/core.js
+++ b/client/src/locales/ja-JP/core.js
@@ -148,11 +148,11 @@ export default {
       userActions_title: 'ユーザーのアクション',
       userAddedThisCardToList: '<0>{{user}}</0> 様が <1>{{list}} をこのカードに追加しました</1>',
       userLeftNewCommentToCard:
-        '{{user}} 様が <2> {{card}} </2> に新しいコメント «{{comment}}» を残しました',
+        '<0>{{user}}</0> 様が <2>{{card}}</2> に新しいコメント «{{comment}}» を残しました',
       userMovedCardFromListToList:
-        '{{user}} 様が <2> {{card}} </2> を {{fromList}} から {{toList}} に移動しました',
+        '<0>{{user}}</0> 様が <2>{{card}}</2> を {{fromList}} から {{toList}} に移動しました',
       userMovedThisCardFromListToList:
-        '<0>{{user}}</0> <1>様がこのカードを {{fromList}} から {{toList}} に移動しました</1>',
+        '<0>{{user}}</0><1> 様がこのカードを {{fromList}} から {{toList}} に移動しました</1>',
       username: 'ユーザー名',
       users: 'ユーザー',
       viewer: 'ビューア',
diff --git a/client/src/locales/ko-KR/core.js b/client/src/locales/ko-KR/core.js
index 42991a28..590a4ffe 100644
--- a/client/src/locales/ko-KR/core.js
+++ b/client/src/locales/ko-KR/core.js
@@ -152,9 +152,10 @@ export default {
       title: '제목',
       userActions_title: '사용자 작업',
       userAddedThisCardToList: '<0>{{user}}</0><1>님이 이 카드를 {{list}}에 추가했습니다</1>',
-      userLeftNewCommentToCard: '{{user}}님이 <2>{{card}}</2>에 새 댓글 «{{comment}}»을 남겼습니다',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0>님이 <2>{{card}}</2>에 새 댓글 «{{comment}}»을 남겼습니다',
       userMovedCardFromListToList:
-        '{{user}}님이 <2>{{card}}</2>를 {{fromList}}에서 {{toList}}로 이동했습니다',
+        '<0>{{user}}</0>님이 <2>{{card}}</2>를 {{fromList}}에서 {{toList}}로 이동했습니다',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> 님이 {{fromList}}에서 {{toList}}로 이 카드를 옮겼습니다</1>',
       username: '사용자 이름',
diff --git a/client/src/locales/nl-NL/core.js b/client/src/locales/nl-NL/core.js
index 6455afa2..6f0f2697 100644
--- a/client/src/locales/nl-NL/core.js
+++ b/client/src/locales/nl-NL/core.js
@@ -149,9 +149,9 @@ export default {
       userActions_title: 'Gebruikersacties',
       userAddedThisCardToList: '<0>{{user}}</0><1> heeft deze kaart toegevoegd aan {{list}}</1>',
       userLeftNewCommentToCard:
-        '{{user}} heeft een nieuwe opmerking achtergelaten «{{comment}}» bij <2>{{card}}</2>',
+        '<0>{{user}}</0> heeft een nieuwe opmerking achtergelaten «{{comment}}» bij <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} heeft <2>{{card}}</2> verplaatst van {{fromList}} naar {{toList}}',
+        '<0>{{user}}</0> heeft <2>{{card}}</2> verplaatst van {{fromList}} naar {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> heeft deze kaart verplaatst van {{fromList}} naar {{toList}}</1>',
       username: 'Gebruikersnaam',
diff --git a/client/src/locales/pl-PL/core.js b/client/src/locales/pl-PL/core.js
index 2b68141b..70ac7cdf 100644
--- a/client/src/locales/pl-PL/core.js
+++ b/client/src/locales/pl-PL/core.js
@@ -149,9 +149,10 @@ export default {
       title: 'Tytuł',
       userActions_title: 'Akcje użytkownika',
       userAddedThisCardToList: '<0>{{user}}</0><1> dodał tę kartę w {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} zamieścił nowy komentarz «{{comment}}» w <2>{{card}}</2>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> zamieścił nowy komentarz «{{comment}}» w <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} przeniósł <2>{{card}}</2> z {{fromList}} do {{toList}}',
+        '<0>{{user}}</0> przeniósł <2>{{card}}</2> z {{fromList}} do {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> przeniósł tę kartę z {{fromList}} do {{toList}}</1>',
       username: 'Nazwa Użytkownika',
diff --git a/client/src/locales/pt-BR/core.js b/client/src/locales/pt-BR/core.js
index 549f3def..6e088dad 100644
--- a/client/src/locales/pt-BR/core.js
+++ b/client/src/locales/pt-BR/core.js
@@ -149,8 +149,9 @@ export default {
       userActions_title: 'Ações do Usuário',
       userAddedThisCardToList: '<0>{{user}}</0><1> adicionou este cartão a {{list}}</1>',
       userLeftNewCommentToCard:
-        '{{user}} deixou um novo comentário «{{comment}}» em <2>{{card}}</2>',
-      userMovedCardFromListToList: '{{user}} moveu <2>{{card}}</2> de {{fromList}} para {{toList}}',
+        '<0>{{user}}</0> deixou um novo comentário «{{comment}}» em <2>{{card}}</2>',
+      userMovedCardFromListToList:
+        '<0>{{user}}</0> moveu <2>{{card}}</2> de {{fromList}} para {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> moveu este cartão de {{fromList}} para {{toList}}</1>',
       username: 'Nome de usuário',
diff --git a/client/src/locales/ro-RO/core.js b/client/src/locales/ro-RO/core.js
index 6e59df46..412cbea5 100644
--- a/client/src/locales/ro-RO/core.js
+++ b/client/src/locales/ro-RO/core.js
@@ -149,9 +149,9 @@ export default {
       userActions_title: 'Acțiunile utilizatorului',
       userAddedThisCardToList: '<0>{{user}}</0><1> a adăugat acest card în {{list}}</1>',
       userLeftNewCommentToCard:
-        '{{user}} a lăsat un nou comentariu «{{comment}}» în <2>{{card}}</2>',
+        '<0>{{user}}</0> a lăsat un nou comentariu «{{comment}}» în <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} a mutat <2>{{card}}</2> din {{fromList}} în {{toList}}',
+        '<0>{{user}}</0> a mutat <2>{{card}}</2> din {{fromList}} în {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> a mutat aceast card din {{fromList}} în {{toList}}</1>',
       username: 'Nume utilizator',
diff --git a/client/src/locales/ru-RU/core.js b/client/src/locales/ru-RU/core.js
index 35aa094c..2ee40787 100644
--- a/client/src/locales/ru-RU/core.js
+++ b/client/src/locales/ru-RU/core.js
@@ -285,9 +285,10 @@ export default {
       uploadedImages: 'Загруженные изображения',
       userActions_title: 'Действия с пользователем',
       userAddedThisCardToList: '<0>{{user}}</0><1> добавил(а) эту карточку в {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} оставил(а) комментарий «{{comment}}» к <2>{{card}}</2>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> оставил(а) комментарий «{{comment}}» к <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} переместил(а) <2>{{card}}</2> из {{fromList}} в {{toList}}',
+        '<0>{{user}}</0> переместил(а) <2>{{card}}</2> из {{fromList}} в {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> переместил(а) эту карточку из {{fromList}} в {{toList}}</1>',
       username: 'Имя пользователя',
diff --git a/client/src/locales/sk-SK/core.js b/client/src/locales/sk-SK/core.js
index db34b94c..b344cabd 100644
--- a/client/src/locales/sk-SK/core.js
+++ b/client/src/locales/sk-SK/core.js
@@ -133,8 +133,10 @@ export default {
       title: 'Názov',
       userActions_title: 'Akcie na používateľovi',
       userAddedThisCardToList: '<0>{{user}}</0><1> pridal kartu do {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} zanechal nový komentár «{{comment}}» k <2>{{card}}</2>',
-      userMovedCardFromListToList: '{{user}} presunul <2>{{card}}</2> z {{fromList}} do {{toList}}',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> zanechal nový komentár «{{comment}}» k <2>{{card}}</2>',
+      userMovedCardFromListToList:
+        '<0>{{user}}</0> presunul <2>{{card}}</2> z {{fromList}} do {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> presunul túto kartu z {{fromList}} do {{toList}}</1>',
       username: 'Používateľské meno',
diff --git a/client/src/locales/sr-Cyrl-CS/core.js b/client/src/locales/sr-Cyrl-CS/core.js
index e687dba9..87a47917 100644
--- a/client/src/locales/sr-Cyrl-CS/core.js
+++ b/client/src/locales/sr-Cyrl-CS/core.js
@@ -153,9 +153,10 @@ export default {
       title: 'Наслов',
       userActions_title: 'Корисничке радње',
       userAddedThisCardToList: '<0>{{user}}</0><1> је додао ову картицу на {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} је оставио нови коментар «{{comment}}» у <2>{{card}}</2>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> је оставио нови коментар «{{comment}}» у <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} је преместио <2>{{card}}</2> са {{fromList}} у {{toList}}',
+        '<0>{{user}}</0> је преместио <2>{{card}}</2> са {{fromList}} у {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> је преместио ову картицу са {{fromList}} на {{toList}}</1>',
       username: 'Корисничко име',
diff --git a/client/src/locales/sr-Latn-CS/core.js b/client/src/locales/sr-Latn-CS/core.js
index 45c9b949..3bdf748b 100644
--- a/client/src/locales/sr-Latn-CS/core.js
+++ b/client/src/locales/sr-Latn-CS/core.js
@@ -153,9 +153,10 @@ export default {
       title: 'Naslov',
       userActions_title: 'Korisničke radnje',
       userAddedThisCardToList: '<0>{{user}}</0><1> je dodao ovu karticu na {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} je ostavio novi komentar «{{comment}}» u <2>{{card}}</2>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> je ostavio novi komentar «{{comment}}» u <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} je premestio <2>{{card}}</2> sa {{fromList}} u {{toList}}',
+        '<0>{{user}}</0> je premestio <2>{{card}}</2> sa {{fromList}} u {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> je premestio ovu karticu sa {{fromList}} na {{toList}}</1>',
       username: 'Korisničko ime',
diff --git a/client/src/locales/sv-SE/core.js b/client/src/locales/sv-SE/core.js
index 845199b5..0a8c729e 100644
--- a/client/src/locales/sv-SE/core.js
+++ b/client/src/locales/sv-SE/core.js
@@ -134,9 +134,10 @@ export default {
       title: 'Titel',
       userActions_title: 'Användaråtgärder',
       userAddedThisCardToList: '<0>{{user}}</0><1> lade till detta kort i {{list}}</1>',
-      userLeftNewCommentToCard: '{{user}} lämnade en ny kommentar «{{comment}}» på <2>{{card}}</2>',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> lämnade en ny kommentar «{{comment}}» på <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} flyttade <2>{{card}}</2> från {{fromList}} till {{toList}}',
+        '<0>{{user}}</0> flyttade <2>{{card}}</2> från {{fromList}} till {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> flyttade detta kort från {{fromList}} till {{toList}}</1>',
       username: 'Användarnamn',
diff --git a/client/src/locales/tr-TR/core.js b/client/src/locales/tr-TR/core.js
index 83cbd18a..b667f2b5 100644
--- a/client/src/locales/tr-TR/core.js
+++ b/client/src/locales/tr-TR/core.js
@@ -136,9 +136,9 @@ export default {
       userActions_title: 'Kullanıcı İşlemleri',
       userAddedThisCardToList: '<0>{{user}}</0><1> bu kartı {{list}</1> listesine ekledi',
       userLeftNewCommentToCard:
-        '{{user}} yeni bir yorum yazdı: <2>{{card}</2> kartına «{{comment}}»',
+        '<0>{{user}}</0> yeni bir yorum yazdı: <2>{{card}</2> kartına «{{comment}}»',
       userMovedCardFromListToList:
-        '{{user}}, <2>{{card}></2> kartını {{fromList}} listesinden {{toList}} listesine taşıdı',
+        '<0>{{user}}</0>, <2>{{card}></2> kartını {{fromList}} listesinden {{toList}} listesine taşıdı',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> bu kartı {{fromList}} konumundan {{toList}}</1> konumuna taşıdı',
       username: 'kullanıcı adı',
diff --git a/client/src/locales/uk-UA/core.js b/client/src/locales/uk-UA/core.js
index ae720306..b3b384ea 100644
--- a/client/src/locales/uk-UA/core.js
+++ b/client/src/locales/uk-UA/core.js
@@ -283,9 +283,9 @@ export default {
       userActions_title: 'Дії користувача',
       userAddedThisCardToList: '<0>{{user}}</0><1> додав(ла) цю картку до {{list}}</1>',
       userLeftNewCommentToCard:
-        '{{user}} залишив(ла) новий коментар «{{comment}}» до <2>{{card}}</2>',
+        '<0>{{user}}</0> залишив(ла) новий коментар «{{comment}}» до <2>{{card}}</2>',
       userMovedCardFromListToList:
-        '{{user}} перемістив(ла) <2>{{card}}</2> з {{fromList}} в {{toList}}',
+        '<0>{{user}}</0> перемістив(ла) <2>{{card}}</2> з {{fromList}} в {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> перемістив(ла) цю картку з {{fromList}} в {{toList}}</1>',
       username: "Ім'я користувача",
diff --git a/client/src/locales/uz-UZ/core.js b/client/src/locales/uz-UZ/core.js
index 1543d1b4..af7245b4 100644
--- a/client/src/locales/uz-UZ/core.js
+++ b/client/src/locales/uz-UZ/core.js
@@ -131,9 +131,10 @@ export default {
       title: 'Sarlavha',
       userActions_title: 'Foydalanuvchi Amallari',
       userAddedThisCardToList: "<1>Ushbu kartani {{list}} ga</1><0>{{user}}</0> qo'shdi",
-      userLeftNewCommentToCard: '{{user}} <2>{{card}}</2> ga yangi izoh qoldirdi «{{comment}}»',
+      userLeftNewCommentToCard:
+        '<0>{{user}}</0> <2>{{card}}</2> ga yangi izoh qoldirdi «{{comment}}»',
       userMovedCardFromListToList:
-        "{{user}} <2>{{card}}</2> ni {{fromList}} dan {{toList}} ga ko'chirdi",
+        "<0>{{user}}</0> <2>{{card}}</2> ni {{fromList}} dan {{toList}} ga ko'chirdi",
       userMovedThisCardFromListToList:
         "<0>{{user}}</0><1> ushbu kartani {{fromList}} dan {{toList}}</1> ga ko'chirdi",
       username: 'Foydalanuvchi nomi',
diff --git a/client/src/locales/zh-CN/core.js b/client/src/locales/zh-CN/core.js
index 5f14367b..d8f3485d 100644
--- a/client/src/locales/zh-CN/core.js
+++ b/client/src/locales/zh-CN/core.js
@@ -144,9 +144,9 @@ export default {
       title: '标题',
       userActions_title: '用户操作',
       userAddedThisCardToList: '<0>{{user}}</0><1> 向列表 {{list}} 添加了该卡片</1>',
-      userLeftNewCommentToCard: '{{user}} 给 {{card}} 添加了一个新评论 «{{comment}}»',
+      userLeftNewCommentToCard: '<0>{{user}}</0> 给 {{card}} 添加了一个新评论 «{{comment}}»',
       userMovedCardFromListToList:
-        '{{user}} 将卡片 <2>{{card}}</2> 从 {{fromList}} 移动到 {{toList}}',
+        '<0>{{user}}</0> 将卡片 <2>{{card}}</2> 从 {{fromList}} 移动到 {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> 将该卡片从 {{fromList}} 移动到 {{toList}}</1>',
       username: '用户名',
diff --git a/client/src/locales/zh-TW/core.js b/client/src/locales/zh-TW/core.js
index 772cdc16..7b2e9b69 100644
--- a/client/src/locales/zh-TW/core.js
+++ b/client/src/locales/zh-TW/core.js
@@ -144,9 +144,9 @@ export default {
       title: '標題',
       userActions_title: '使用者操作',
       userAddedThisCardToList: '<0>{{user}}</0><1> 向列表 {{list}} 添加了該卡片</1>',
-      userLeftNewCommentToCard: '{{user}} 給 {{card}} 添加了一條新評論 「{{comment}}」',
+      userLeftNewCommentToCard: '<0>{{user}}</0> 給 {{card}} 添加了一條新評論 「{{comment}}」',
       userMovedCardFromListToList:
-        '{{user}} 將卡片 <2>{{card}}</2> 從 {{fromList}} 移動到 {{toList}}',
+        '<0>{{user}}</0> 將卡片 <2>{{card}}</2> 從 {{fromList}} 移動到 {{toList}}',
       userMovedThisCardFromListToList:
         '<0>{{user}}</0><1> 將該卡片從 {{fromList}} 移動到 {{toList}}</1>',
       username: '使用者名稱',