From 73d66e261e37bab55b17556c666169821c5f9cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 11:58:25 +0100 Subject: [PATCH 01/11] Change user menu entry 'All notifications' to 'Notifications' --- webapp/locales/de.json | 2 +- webapp/locales/en.json | 2 +- webapp/locales/es.json | 2 +- webapp/locales/fr.json | 2 +- webapp/locales/it.json | 2 +- webapp/locales/nl.json | 2 +- webapp/locales/pl.json | 3 ++- webapp/locales/pt.json | 2 +- webapp/locales/ru.json | 2 +- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 88852504a..6a3f6545a 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -730,7 +730,7 @@ "tooltip": "Meine Banachrichtigungen" }, "markAllAsRead": "Markiere alle als gelesen", - "pageLink": "Alle Benachrichtigungen", + "pageLink": "Benachrichtigungen", "post": "Beitrag oder Gruppe", "reason": { "changed_group_member_role": "Hat Deine Rolle in der Gruppe geändert …", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index c42d6beaa..d8d1e6d46 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -730,7 +730,7 @@ "tooltip": "My notifications" }, "markAllAsRead": "Mark all as read", - "pageLink": "All notifications", + "pageLink": "Notifications", "post": "Post or Group", "reason": { "changed_group_member_role": "Changed your role in group …", diff --git a/webapp/locales/es.json b/webapp/locales/es.json index ae455e5eb..80f0197e2 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -417,7 +417,7 @@ "unread": "No leído" }, "markAllAsRead": "Marcar todas como leido", - "pageLink": "Todas las notificaciones", + "pageLink": "Notificaciones", "post": "Contribución", "reason": { "commented_on_post": "Comentó su contribución ...", diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index 2720f8deb..9d0a72336 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -411,7 +411,7 @@ "tooltip": "Mes notifications" }, "markAllAsRead": "Tout marquer comme lu", - "pageLink": "Toutes les notifications", + "pageLink": "Notifications", "post": "Post", "reason": { "commented_on_post": "Commenté sur votre post…", diff --git a/webapp/locales/it.json b/webapp/locales/it.json index 548278fc9..ac31b6877 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -356,7 +356,7 @@ "unread": null }, "markAllAsRead": "Segna tutti come letti", - "pageLink": null, + "pageLink": "Notifiche", "post": null, "reason": { "commented_on_post": null, diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index 27fbc8865..364adbac3 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -111,7 +111,7 @@ "unread": null }, "markAllAsRead": "Markeer alles als gelezen", - "pageLink": null, + "pageLink": "Notificaties", "post": null, "reason": { "commented_on_post": null, diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index 3b7d1200a..3c0ccb0b7 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -203,7 +203,8 @@ "markAllAsRead": "Oznacz wszystkie jako przeczytane", "menu": { "mentioned": "wspomiał o Tobie we wpisie" - } + }, + "pageLink": "Powiadomienia" }, "post": { "comment": { diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 121fc903d..661a3e10c 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -392,7 +392,7 @@ "unread": "Não lido" }, "markAllAsRead": "Marcar todas como lidas", - "pageLink": "Todas as notificações", + "pageLink": "Notificações", "post": "Post", "reason": { "commented_on_post": "Comentou no seu post …", diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index 4ae664cd8..3ed1f2ba0 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -428,7 +428,7 @@ "unread": "Непрочитанные" }, "markAllAsRead": "Отметить все как прочитанное", - "pageLink": "Все уведомления", + "pageLink": "Уведомления", "post": "Пост", "reason": { "commented_on_post": "Комментарий к посту...", From 6f4c6c2fd67c06c29b29cfd43382c57030a766fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 12:18:01 +0100 Subject: [PATCH 02/11] Add 'Chats' entry to user menu --- webapp/components/AvatarMenu/AvatarMenu.vue | 5 +++++ webapp/locales/de.json | 1 + webapp/locales/en.json | 1 + webapp/locales/es.json | 5 +++++ webapp/locales/fr.json | 5 +++++ webapp/locales/it.json | 5 +++++ webapp/locales/nl.json | 5 +++++ webapp/locales/pl.json | 5 +++++ webapp/locales/pt.json | 5 +++++ webapp/locales/ru.json | 5 +++++ 10 files changed, 42 insertions(+) diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue index 977996092..d82d08734 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.vue +++ b/webapp/components/AvatarMenu/AvatarMenu.vue @@ -92,6 +92,11 @@ export default { path: '/groups', icon: 'users', }, + { + name: this.$t('header.avatarMenu.chats'), + path: `/chat`, + icon: 'chat-bubble', + }, { name: this.$t('notifications.pageLink'), path: '/notifications', diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 6a3f6545a..6eb2e53af 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -575,6 +575,7 @@ "button": { "tooltip": "Mein Profil" }, + "chats": "Chats", "groups": "Gruppen", "myProfile": "Mein Profil" }, diff --git a/webapp/locales/en.json b/webapp/locales/en.json index d8d1e6d46..a6e3db2df 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -575,6 +575,7 @@ "button": { "tooltip": "My profile" }, + "chats": "Chats", "groups": "Groups", "myProfile": "My profile" }, diff --git a/webapp/locales/es.json b/webapp/locales/es.json index 80f0197e2..aeb4a02de 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -316,6 +316,11 @@ "hashtag-search": "Buscando a #{hashtag}", "title": "Su burbuja de filtro" }, + "header": { + "avatarMenu": { + "chats": "Chats" + } + }, "index": { "change-filter-settings": "Cambie la configuración de sus filtros para obtener más resultados.", "no-results": "No se han encontrado contribuciones." diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index 9d0a72336..b5034202c 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -306,6 +306,11 @@ "hashtag-search": "Recherche de #{hashtag}", "title": "Votre bulle de filtre" }, + "header": { + "avatarMenu": { + "chats": "Chats" + } + }, "index": { "change-filter-settings": "Modifiez les paramètres de filtrage pour obtenir plus de résultats.", "no-results": "Pas de contribution trouvée." diff --git a/webapp/locales/it.json b/webapp/locales/it.json index ac31b6877..2ce343660 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -310,6 +310,11 @@ "hashtag-search": null, "title": null }, + "header": { + "avatarMenu": { + "chats": "Chat" + } + }, "index": { "change-filter-settings": null, "no-results": null diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index 364adbac3..cfd18d524 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -93,6 +93,11 @@ "membersCount": null, "membersListTitle": null }, + "header": { + "avatarMenu": { + "chats": "Chats" + } + }, "login": { "email": "Uw E-mail", "hello": "Hallo", diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index 3c0ccb0b7..7c75e1d2c 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -180,6 +180,11 @@ "hashtags-filter": { "title": "Twoja bańka filtrująca" }, + "header": { + "avatarMenu": { + "chats": "Czaty" + } + }, "login": { "email": "Twój adres e-mail", "forgotPassword": "Zapomniałeś hasła?", diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 661a3e10c..703c7ec2a 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -348,6 +348,11 @@ "hashtag-search": "Procurando por #{hashtag}", "title": "Sua bolha de filtro" }, + "header": { + "avatarMenu": { + "chats": "Chats" + } + }, "index": { "change-filter-settings": "Altere suas configurações de filtro para obter mais resultados.", "no-results": "Nenhuma contribuição encontrada." diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index 3ed1f2ba0..b97f22d2d 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -327,6 +327,11 @@ "hashtag-search": "Поиск по #{hashtag}", "title": "Ваш фильтр пузыря" }, + "header": { + "avatarMenu": { + "chats": "Чаты" + } + }, "index": { "change-filter-settings": "Измените настройки фильтра, чтобы получить больше результатов.", "no-results": "Посты не найдены." From 4090a8b6b350decb36af69f577d5f2248babc204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 13:25:56 +0100 Subject: [PATCH 03/11] Split locales entry 'notifications.pageLink' by adding a 'header.avatarMenu.notifications' entry to have them seperated --- webapp/components/AvatarMenu/AvatarMenu.vue | 2 +- webapp/locales/de.json | 3 ++- webapp/locales/en.json | 3 ++- webapp/locales/es.json | 3 ++- webapp/locales/fr.json | 3 ++- webapp/locales/it.json | 3 ++- webapp/locales/nl.json | 3 ++- webapp/locales/pl.json | 3 ++- webapp/locales/pt.json | 3 ++- webapp/locales/ru.json | 3 ++- 10 files changed, 19 insertions(+), 10 deletions(-) diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue index d82d08734..1f24818ed 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.vue +++ b/webapp/components/AvatarMenu/AvatarMenu.vue @@ -98,7 +98,7 @@ export default { icon: 'chat-bubble', }, { - name: this.$t('notifications.pageLink'), + name: this.$t('header.avatarMenu.notifications'), path: '/notifications', icon: 'bell', }, diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 6eb2e53af..5fe3f4679 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -577,7 +577,8 @@ }, "chats": "Chats", "groups": "Gruppen", - "myProfile": "Mein Profil" + "myProfile": "Mein Profil", + "notifications": "Benachrichtigungen" }, "chat": { "tooltip": "Meine Chats" diff --git a/webapp/locales/en.json b/webapp/locales/en.json index a6e3db2df..6bf221337 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -577,7 +577,8 @@ }, "chats": "Chats", "groups": "Groups", - "myProfile": "My profile" + "myProfile": "My profile", + "notifications": "Notifications" }, "chat": { "tooltip": "My chats" diff --git a/webapp/locales/es.json b/webapp/locales/es.json index aeb4a02de..1a102e27e 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -318,7 +318,8 @@ }, "header": { "avatarMenu": { - "chats": "Chats" + "chats": "Chats", + "notifications": "Notificaciones" } }, "index": { diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index b5034202c..098bcef18 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -308,7 +308,8 @@ }, "header": { "avatarMenu": { - "chats": "Chats" + "chats": "Chats", + "notifications": "Notifications" } }, "index": { diff --git a/webapp/locales/it.json b/webapp/locales/it.json index 2ce343660..35f523d26 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -312,7 +312,8 @@ }, "header": { "avatarMenu": { - "chats": "Chat" + "chats": "Chat", + "notifications": "Notifiche" } }, "index": { diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index cfd18d524..672f759cd 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -95,7 +95,8 @@ }, "header": { "avatarMenu": { - "chats": "Chats" + "chats": "Chats", + "notifications": "Notificaties" } }, "login": { diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index 7c75e1d2c..5291fe1fe 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -182,7 +182,8 @@ }, "header": { "avatarMenu": { - "chats": "Czaty" + "chats": "Czaty", + "notifications": "Powiadomienia" } }, "login": { diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 703c7ec2a..c99b092f3 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -350,7 +350,8 @@ }, "header": { "avatarMenu": { - "chats": "Chats" + "chats": "Chats", + "notifications": "Notificações" } }, "index": { diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index b97f22d2d..02bfcef93 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -329,7 +329,8 @@ }, "header": { "avatarMenu": { - "chats": "Чаты" + "chats": "Чаты", + "notifications": "Уведомления" } }, "index": { From 507ca96429a8633b9b6063d7186c751099e0d788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 13:28:59 +0100 Subject: [PATCH 04/11] Revert partly "Auxiliary commit to revert individual files from 73d66e261e37bab55b17556c666169821c5f9cf5" This reverts commit 4770032556f76f392592c09a9cde37f32bf79b14. --- webapp/locales/de.json | 2 +- webapp/locales/en.json | 2 +- webapp/locales/es.json | 2 +- webapp/locales/fr.json | 2 +- webapp/locales/pt.json | 2 +- webapp/locales/ru.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 5fe3f4679..761192e06 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -732,7 +732,7 @@ "tooltip": "Meine Banachrichtigungen" }, "markAllAsRead": "Markiere alle als gelesen", - "pageLink": "Benachrichtigungen", + "pageLink": "Alle Benachrichtigungen", "post": "Beitrag oder Gruppe", "reason": { "changed_group_member_role": "Hat Deine Rolle in der Gruppe geändert …", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 6bf221337..92e88b73c 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -732,7 +732,7 @@ "tooltip": "My notifications" }, "markAllAsRead": "Mark all as read", - "pageLink": "Notifications", + "pageLink": "All notifications", "post": "Post or Group", "reason": { "changed_group_member_role": "Changed your role in group …", diff --git a/webapp/locales/es.json b/webapp/locales/es.json index 1a102e27e..f98959912 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -423,7 +423,7 @@ "unread": "No leído" }, "markAllAsRead": "Marcar todas como leido", - "pageLink": "Notificaciones", + "pageLink": "Todas las notificaciones", "post": "Contribución", "reason": { "commented_on_post": "Comentó su contribución ...", diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index 098bcef18..1497cc11b 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -417,7 +417,7 @@ "tooltip": "Mes notifications" }, "markAllAsRead": "Tout marquer comme lu", - "pageLink": "Notifications", + "pageLink": "Toutes les notifications", "post": "Post", "reason": { "commented_on_post": "Commenté sur votre post…", diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index c99b092f3..95971f6d1 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -398,7 +398,7 @@ "unread": "Não lido" }, "markAllAsRead": "Marcar todas como lidas", - "pageLink": "Notificações", + "pageLink": "Todas as notificações", "post": "Post", "reason": { "commented_on_post": "Comentou no seu post …", diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index 02bfcef93..977b9c2c4 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -434,7 +434,7 @@ "unread": "Непрочитанные" }, "markAllAsRead": "Отметить все как прочитанное", - "pageLink": "Уведомления", + "pageLink": "Все уведомления", "post": "Пост", "reason": { "commented_on_post": "Комментарий к посту...", From b4533a54f6e50e07e888ee1f6e6e7b70d6bce559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 13:34:37 +0100 Subject: [PATCH 05/11] Change user menu entry 'Notifications' of Polish, Netherlands and Italian to 'All notifications' --- webapp/locales/it.json | 2 +- webapp/locales/nl.json | 2 +- webapp/locales/pl.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/locales/it.json b/webapp/locales/it.json index 35f523d26..648460770 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -362,7 +362,7 @@ "unread": null }, "markAllAsRead": "Segna tutti come letti", - "pageLink": "Notifiche", + "pageLink": "Tutte le notifiche", "post": null, "reason": { "commented_on_post": null, diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index 672f759cd..5253873c9 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -117,7 +117,7 @@ "unread": null }, "markAllAsRead": "Markeer alles als gelezen", - "pageLink": "Notificaties", + "pageLink": "Alle notificaties", "post": null, "reason": { "commented_on_post": null, diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index 5291fe1fe..4fbf1f1ee 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -210,7 +210,7 @@ "menu": { "mentioned": "wspomiał o Tobie we wpisie" }, - "pageLink": "Powiadomienia" + "pageLink": "Wszystkie powiadomienia" }, "post": { "comment": { From 51e663e0a6f04c8499303d662240619b66d0c736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 13:54:57 +0100 Subject: [PATCH 06/11] Change menu tooltip 'My chats' to 'Chats' and rename identifier from 'header.chat.tooltip' to 'header.chats.tooltip' --- .../components/ChatNotificationMenu/ChatNotificationMenu.vue | 2 +- webapp/locales/de.json | 4 ++-- webapp/locales/en.json | 4 ++-- webapp/locales/es.json | 3 +++ webapp/locales/fr.json | 3 +++ webapp/locales/it.json | 3 +++ webapp/locales/nl.json | 3 +++ webapp/locales/pl.json | 3 +++ webapp/locales/pt.json | 3 +++ webapp/locales/ru.json | 3 +++ 10 files changed, 26 insertions(+), 5 deletions(-) diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue index dd36b965a..dc921f1b2 100644 --- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue +++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue @@ -4,7 +4,7 @@ ghost circle v-tooltip="{ - content: $t('header.chat.tooltip'), + content: $t('header.chats.tooltip'), placement: 'bottom-start', }" > diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 761192e06..5857af770 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -580,8 +580,8 @@ "myProfile": "Mein Profil", "notifications": "Benachrichtigungen" }, - "chat": { - "tooltip": "Meine Chats" + "chats": { + "tooltip": "Chats" } }, "index": { diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 92e88b73c..4b430622f 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -580,8 +580,8 @@ "myProfile": "My profile", "notifications": "Notifications" }, - "chat": { - "tooltip": "My chats" + "chats": { + "tooltip": "Chats" } }, "index": { diff --git a/webapp/locales/es.json b/webapp/locales/es.json index f98959912..dc6043446 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -320,6 +320,9 @@ "avatarMenu": { "chats": "Chats", "notifications": "Notificaciones" + }, + "chats": { + "tooltip": "Chats" } }, "index": { diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index 1497cc11b..c84512ee1 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -310,6 +310,9 @@ "avatarMenu": { "chats": "Chats", "notifications": "Notifications" + }, + "chats": { + "tooltip": "Chats" } }, "index": { diff --git a/webapp/locales/it.json b/webapp/locales/it.json index 648460770..731d67b5f 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -314,6 +314,9 @@ "avatarMenu": { "chats": "Chat", "notifications": "Notifiche" + }, + "chats": { + "tooltip": "Chat" } }, "index": { diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index 5253873c9..7b6f1b7c0 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -97,6 +97,9 @@ "avatarMenu": { "chats": "Chats", "notifications": "Notificaties" + }, + "chats": { + "tooltip": "Chats" } }, "login": { diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index 4fbf1f1ee..0acb39aad 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -184,6 +184,9 @@ "avatarMenu": { "chats": "Czaty", "notifications": "Powiadomienia" + }, + "chats": { + "tooltip": "Czaty" } }, "login": { diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 95971f6d1..8fc4a6478 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -352,6 +352,9 @@ "avatarMenu": { "chats": "Chats", "notifications": "Notificações" + }, + "chats": { + "tooltip": "Chats" } }, "index": { diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index 977b9c2c4..f364514fc 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -331,6 +331,9 @@ "avatarMenu": { "chats": "Чаты", "notifications": "Уведомления" + }, + "chats": { + "tooltip": "Чаты" } }, "index": { From 47305320d6744f7feed5b870fa1674e4ae11cb35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 14:32:03 +0100 Subject: [PATCH 07/11] Change menu tooltip 'My notifications' to 'Notifications' and rename identifier from 'notifications.headerMenuButton.tooltip' to 'header.notifications.tooltip' --- webapp/components/NotificationMenu/NotificationMenu.vue | 4 ++-- webapp/locales/de.json | 6 +++--- webapp/locales/en.json | 6 +++--- webapp/locales/es.json | 3 +++ webapp/locales/fr.json | 6 +++--- webapp/locales/it.json | 3 +++ webapp/locales/nl.json | 3 +++ webapp/locales/pl.json | 3 +++ webapp/locales/pt.json | 3 +++ webapp/locales/ru.json | 3 +++ 10 files changed, 29 insertions(+), 11 deletions(-) diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue index d0e21bf96..276da8490 100644 --- a/webapp/components/NotificationMenu/NotificationMenu.vue +++ b/webapp/components/NotificationMenu/NotificationMenu.vue @@ -9,7 +9,7 @@ ghost circle v-tooltip="{ - content: $t('notifications.headerMenuButton.tooltip'), + content: $t('header.notifications.tooltip'), placement: 'bottom-start', }" /> @@ -20,7 +20,7 @@ ghost circle v-tooltip="{ - content: $t('notifications.headerMenuButton.tooltip'), + content: $t('header.notifications.tooltip'), placement: 'bottom-start', }" @click="toggleMenu" diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 5857af770..20d531b98 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -582,6 +582,9 @@ }, "chats": { "tooltip": "Chats" + }, + "notifications": { + "tooltip": "Banachrichtigungen" } }, "index": { @@ -728,9 +731,6 @@ "unread": "Ungelesen" }, "group": "Beschreibung", - "headerMenuButton": { - "tooltip": "Meine Banachrichtigungen" - }, "markAllAsRead": "Markiere alle als gelesen", "pageLink": "Alle Benachrichtigungen", "post": "Beitrag oder Gruppe", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 4b430622f..41352a72f 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -582,6 +582,9 @@ }, "chats": { "tooltip": "Chats" + }, + "notifications": { + "tooltip": "Notifications" } }, "index": { @@ -728,9 +731,6 @@ "unread": "Unread" }, "group": "Description", - "headerMenuButton": { - "tooltip": "My notifications" - }, "markAllAsRead": "Mark all as read", "pageLink": "All notifications", "post": "Post or Group", diff --git a/webapp/locales/es.json b/webapp/locales/es.json index dc6043446..bb1de806c 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -323,6 +323,9 @@ }, "chats": { "tooltip": "Chats" + }, + "notifications": { + "tooltip": "Notificaciones" } }, "index": { diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index c84512ee1..b6be97042 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -313,6 +313,9 @@ }, "chats": { "tooltip": "Chats" + }, + "notifications": { + "tooltip": "Notifications" } }, "index": { @@ -416,9 +419,6 @@ "unread": "Non lu" }, "group": "Description", - "headerMenuButton": { - "tooltip": "Mes notifications" - }, "markAllAsRead": "Tout marquer comme lu", "pageLink": "Toutes les notifications", "post": "Post", diff --git a/webapp/locales/it.json b/webapp/locales/it.json index 731d67b5f..9b7c613db 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -317,6 +317,9 @@ }, "chats": { "tooltip": "Chat" + }, + "notifications": { + "tooltip": "Notifiche" } }, "index": { diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index 7b6f1b7c0..88e616d79 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -100,6 +100,9 @@ }, "chats": { "tooltip": "Chats" + }, + "notifications": { + "tooltip": "Notificaties" } }, "login": { diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index 0acb39aad..d5021f809 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -187,6 +187,9 @@ }, "chats": { "tooltip": "Czaty" + }, + "notifications": { + "tooltip": "Powiadomienia" } }, "login": { diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 8fc4a6478..7132b7b76 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -355,6 +355,9 @@ }, "chats": { "tooltip": "Chats" + }, + "notifications": { + "tooltip": "Notificações" } }, "index": { diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index f364514fc..18fbfe12d 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -334,6 +334,9 @@ }, "chats": { "tooltip": "Чаты" + }, + "notifications": { + "tooltip": "Уведомления" } }, "index": { From c90d5b7edbc180fe98dbffe4b3cd76db59ada19e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 14:50:52 +0100 Subject: [PATCH 08/11] Change menu tool tip 'Show groups' to 'Groups' and rename identifier from 'group.button.tooltip' to 'header.groups.tooltip' --- webapp/components/Group/GroupButton.vue | 2 +- webapp/locales/de.json | 6 +++--- webapp/locales/en.json | 6 +++--- webapp/locales/es.json | 4 ++++ webapp/locales/fr.json | 4 ++++ webapp/locales/it.json | 4 ++++ webapp/locales/nl.json | 4 ++++ webapp/locales/pl.json | 4 ++++ webapp/locales/pt.json | 4 ++++ webapp/locales/ru.json | 4 ++++ 10 files changed, 35 insertions(+), 7 deletions(-) diff --git a/webapp/components/Group/GroupButton.vue b/webapp/components/Group/GroupButton.vue index 10275dcca..ee3ca2669 100644 --- a/webapp/components/Group/GroupButton.vue +++ b/webapp/components/Group/GroupButton.vue @@ -6,7 +6,7 @@ circle ghost v-tooltip="{ - content: $t('group.button.tooltip'), + content: $t('header.groups.tooltip'), placement: 'bottom-start', }" /> diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 20d531b98..f49c9e925 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -481,9 +481,6 @@ "addUserNoOptions": "Keine Nutzer gefunden!", "addUserPlaceholder": "Nutzername", "allGroups": "Alle Gruppen", - "button": { - "tooltip": "Gruppen anzeigen" - }, "categories": "Thema ::: Themen", "categoriesTitle": "Themen der Gruppe", "changeMemberRole": "Die Rolle wurde auf „{role}“ geändert!", @@ -583,6 +580,9 @@ "chats": { "tooltip": "Chats" }, + "groups": { + "tooltip": "Gruppen" + }, "notifications": { "tooltip": "Banachrichtigungen" } diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 41352a72f..f244dd2b3 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -481,9 +481,6 @@ "addUserNoOptions": "No users found!", "addUserPlaceholder": "User name", "allGroups": "All Groups", - "button": { - "tooltip": "Show groups" - }, "categories": "Topic ::: Topics", "categoriesTitle": "Topics of the group", "changeMemberRole": "The role has been changed to “{role}”!", @@ -583,6 +580,9 @@ "chats": { "tooltip": "Chats" }, + "groups": { + "tooltip": "Groups" + }, "notifications": { "tooltip": "Notifications" } diff --git a/webapp/locales/es.json b/webapp/locales/es.json index bb1de806c..21954a4e1 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -319,11 +319,15 @@ "header": { "avatarMenu": { "chats": "Chats", + "groups": "Grupos", "notifications": "Notificaciones" }, "chats": { "tooltip": "Chats" }, + "groups": { + "tooltip": "Grupos" + }, "notifications": { "tooltip": "Notificaciones" } diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index b6be97042..2a5c070ca 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -309,11 +309,15 @@ "header": { "avatarMenu": { "chats": "Chats", + "groups": "Groupes", "notifications": "Notifications" }, "chats": { "tooltip": "Chats" }, + "groups": { + "tooltip": "Groupes" + }, "notifications": { "tooltip": "Notifications" } diff --git a/webapp/locales/it.json b/webapp/locales/it.json index 9b7c613db..31e496c45 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -313,11 +313,15 @@ "header": { "avatarMenu": { "chats": "Chat", + "groups": "Gruppi", "notifications": "Notifiche" }, "chats": { "tooltip": "Chat" }, + "groups": { + "tooltip": "Gruppi" + }, "notifications": { "tooltip": "Notifiche" } diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index 88e616d79..933942e2a 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -96,11 +96,15 @@ "header": { "avatarMenu": { "chats": "Chats", + "groups": "Groepen", "notifications": "Notificaties" }, "chats": { "tooltip": "Chats" }, + "groups": { + "tooltip": "Groepen" + }, "notifications": { "tooltip": "Notificaties" } diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index d5021f809..bb0fc43df 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -183,11 +183,15 @@ "header": { "avatarMenu": { "chats": "Czaty", + "groups": "Grupy", "notifications": "Powiadomienia" }, "chats": { "tooltip": "Czaty" }, + "groups": { + "tooltip": "Grupy" + }, "notifications": { "tooltip": "Powiadomienia" } diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 7132b7b76..9a5b80c12 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -351,11 +351,15 @@ "header": { "avatarMenu": { "chats": "Chats", + "groups": "Grupos", "notifications": "Notificações" }, "chats": { "tooltip": "Chats" }, + "groups": { + "tooltip": "Grupos" + }, "notifications": { "tooltip": "Notificações" } diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index 18fbfe12d..08932bd7c 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -330,11 +330,15 @@ "header": { "avatarMenu": { "chats": "Чаты", + "groups": "Группы", "notifications": "Уведомления" }, "chats": { "tooltip": "Чаты" }, + "groups": { + "tooltip": "Группы" + }, "notifications": { "tooltip": "Уведомления" } From 3afa99e11675bfb00a0cded047f9eef764761e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 14:55:02 +0100 Subject: [PATCH 09/11] Change menu tool tip 'Show map' to 'Map' and rename identifier from 'map.button.tooltip' to 'header.map.tooltip' --- webapp/components/Map/MapButton.vue | 2 +- webapp/locales/de.json | 6 +++--- webapp/locales/en.json | 6 +++--- webapp/locales/es.json | 3 +++ webapp/locales/fr.json | 3 +++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/webapp/components/Map/MapButton.vue b/webapp/components/Map/MapButton.vue index c0ee361d6..88f174c8c 100644 --- a/webapp/components/Map/MapButton.vue +++ b/webapp/components/Map/MapButton.vue @@ -6,7 +6,7 @@ circle ghost v-tooltip="{ - content: $t('map.button.tooltip'), + content: $t('header.map.tooltip'), placement: 'bottom-start', }" > diff --git a/webapp/locales/de.json b/webapp/locales/de.json index f49c9e925..3d53696fc 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -583,6 +583,9 @@ "groups": { "tooltip": "Gruppen" }, + "map": { + "tooltip": "Landkarte" + }, "notifications": { "tooltip": "Banachrichtigungen" } @@ -625,9 +628,6 @@ }, "map": { "alertMessage": "Es kann nicht auf die Karte zugegriffen werden: Der Mapbox-Token ist auf dem Server nicht gesetzt!", - "button": { - "tooltip": "Landkarte anzeigen" - }, "legend": { "event": "Veranstaltung", "group": "Gruppe", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index f244dd2b3..495c8c395 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -583,6 +583,9 @@ "groups": { "tooltip": "Groups" }, + "map": { + "tooltip": "Map" + }, "notifications": { "tooltip": "Notifications" } @@ -625,9 +628,6 @@ }, "map": { "alertMessage": "The map cannot be accessed: The Mapbox token is not set on the server!", - "button": { - "tooltip": "Show map" - }, "legend": { "event": "Event", "group": "Group", diff --git a/webapp/locales/es.json b/webapp/locales/es.json index 21954a4e1..b27b957a9 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -328,6 +328,9 @@ "groups": { "tooltip": "Grupos" }, + "map": { + "tooltip": "Mapa" + }, "notifications": { "tooltip": "Notificaciones" } diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index 2a5c070ca..91d1a3680 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -318,6 +318,9 @@ "groups": { "tooltip": "Groupes" }, + "map": { + "tooltip": "Carte" + }, "notifications": { "tooltip": "Notifications" } From 9d9b325d4302685d22d910a9d14c0be3e331a1b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 24 Jan 2024 15:05:01 +0100 Subject: [PATCH 10/11] Add 'Map' entry to user menu --- webapp/components/AvatarMenu/AvatarMenu.vue | 5 +++++ webapp/locales/de.json | 1 + webapp/locales/en.json | 1 + webapp/locales/es.json | 1 + webapp/locales/fr.json | 1 + 5 files changed, 9 insertions(+) diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue index 1f24818ed..ac583ed4b 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.vue +++ b/webapp/components/AvatarMenu/AvatarMenu.vue @@ -92,6 +92,11 @@ export default { path: '/groups', icon: 'users', }, + { + name: this.$t('header.avatarMenu.map'), + path: `/map`, + icon: 'globe', + }, { name: this.$t('header.avatarMenu.chats'), path: `/chat`, diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 3d53696fc..71c2f32c5 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -574,6 +574,7 @@ }, "chats": "Chats", "groups": "Gruppen", + "map": "Landkarte", "myProfile": "Mein Profil", "notifications": "Benachrichtigungen" }, diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 495c8c395..a53f25075 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -574,6 +574,7 @@ }, "chats": "Chats", "groups": "Groups", + "map": "Map", "myProfile": "My profile", "notifications": "Notifications" }, diff --git a/webapp/locales/es.json b/webapp/locales/es.json index b27b957a9..5d28d7fe9 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -320,6 +320,7 @@ "avatarMenu": { "chats": "Chats", "groups": "Grupos", + "map": "Mapa", "notifications": "Notificaciones" }, "chats": { diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index 91d1a3680..34873ec00 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -310,6 +310,7 @@ "avatarMenu": { "chats": "Chats", "groups": "Groupes", + "map": "Carte", "notifications": "Notifications" }, "chats": { From 0ef5adb66cbd931f358eb3826dd505c3d02ee1d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 25 Jan 2024 12:57:12 +0100 Subject: [PATCH 11/11] Fix webapp tests --- webapp/components/AvatarMenu/AvatarMenu.spec.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/webapp/components/AvatarMenu/AvatarMenu.spec.js b/webapp/components/AvatarMenu/AvatarMenu.spec.js index be34c1804..7adedb034 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.spec.js +++ b/webapp/components/AvatarMenu/AvatarMenu.spec.js @@ -113,9 +113,9 @@ describe('AvatarMenu.vue', () => { expect(settingsLink.exists()).toBe(true) }) - it('displays a total of 4 links', () => { + it('displays a total of 6 links', () => { const allLinks = wrapper.findAll('.ds-menu-item') - expect(allLinks).toHaveLength(4) + expect(allLinks).toHaveLength(6) }) }) @@ -139,9 +139,9 @@ describe('AvatarMenu.vue', () => { expect(moderationLink.exists()).toBe(true) }) - it('displays a total of 5 links', () => { + it('displays a total of 7 links', () => { const allLinks = wrapper.findAll('.ds-menu-item') - expect(allLinks).toHaveLength(5) + expect(allLinks).toHaveLength(7) }) }) @@ -165,9 +165,9 @@ describe('AvatarMenu.vue', () => { expect(adminLink.exists()).toBe(true) }) - it('displays a total of 6 links', () => { + it('displays a total of 8 links', () => { const allLinks = wrapper.findAll('.ds-menu-item') - expect(allLinks).toHaveLength(6) + expect(allLinks).toHaveLength(8) }) }) })