add message no_unread_messages

apps/app/public/static/locales/en_US/commons.json

@@ -62,6 +62,7 @@
     "all": "All",
     "unopend": "Unread",
     "mark_all_as_read": "Mark all as read",
+    "no_unread_messages": "no_unread_messages",
     "only_unread": "Only unread"
   },
 

apps/app/public/static/locales/fr_FR/commons.json

@@ -61,7 +61,8 @@
     "no_notification": "Vous n'avez pas de notifications.",
     "all": "Toutes",
     "unopend": "Non-lues",
-    "mark_all_as_read": "Tout marquer comme lu"
+    "mark_all_as_read": "Tout marquer comme lu",
+    "no_unread_messages": "aucun message non lu"
   },
 
   "personal_dropdown": {

apps/app/public/static/locales/ja_JP/commons.json

@@ -64,6 +64,7 @@
     "all": "全て",
     "unopend": "未読",
     "mark_all_as_read": "全て既読にする",
+    "no_unread_messages": "未読はありません",
     "only_unread": "未読のみ"
   },
 

apps/app/public/static/locales/zh_CN/commons.json

@@ -65,6 +65,7 @@
     "all": "全部",
     "unopend": "未读",
     "mark_all_as_read" : "标记为已读",
+    "no_unread_messages": "no_unread_messages",
     "only_unread": "Only unread"
   },
 

apps/app/src/client/components/InAppNotification/InAppNotificationDropdown.tsx

@@ -72,7 +72,7 @@ export const InAppNotificationDropdown = (): JSX.Element => {
         <DropdownMenu end>
           { inAppNotificationData != null && inAppNotificationData.docs.length === 0
           // no items
-            ? <DropdownItem disabled>{t('in_app_notification.mark_all_as_read')}</DropdownItem>
+            ? <DropdownItem disabled>{t('in_app_notification.no_unread_messages')}</DropdownItem>
           // render DropdownItem
             : <InAppNotificationList inAppNotificationData={inAppNotificationData} />
           }

apps/app/src/client/components/InAppNotification/InAppNotificationPage.tsx

@@ -79,7 +79,7 @@ export const InAppNotificationPage: FC = () => {
       )}
         { notificationData != null && notificationData.docs.length === 0
           // no items
-          ? t('in_app_notification.mark_all_as_read')
+          ? t('in_app_notification.no_unread_messages')
           // render list-group
           : (
             <InAppNotificationList inAppNotificationData={notificationData} />

conflict-file.txt

@@ -1 +0,0 @@
-コンフリクトを起こします