From 97895d515b94c2b5dcbedac0700b987b9d7159d9 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 7 Nov 2022 11:22:54 +0100 Subject: [PATCH 1/4] Register missing BellOutline and BellOffOutline icons Signed-off-by: Thomas Citharel --- js/src/components/core/MaterialIcon.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/src/components/core/MaterialIcon.vue b/js/src/components/core/MaterialIcon.vue index 4b69b3ab..59bdd97a 100644 --- a/js/src/components/core/MaterialIcon.vue +++ b/js/src/components/core/MaterialIcon.vue @@ -240,6 +240,12 @@ const icons: Record Promise> = { import(`../../../node_modules/vue-material-design-icons/ViewList.vue`), SmokingOff: () => import(`../../../node_modules/vue-material-design-icons/SmokingOff.vue`), + BellOutline: () => + import(`../../../node_modules/vue-material-design-icons/BellOutline.vue`), + BellOffOutline: () => + import( + `../../../node_modules/vue-material-design-icons/BellOffOutline.vue` + ), }; const props = withDefaults( From 066e71c51731a4ed6614c9b406b6e670dfabd495 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 7 Nov 2022 11:23:15 +0100 Subject: [PATCH 2/4] Don't load group status when unlogged Signed-off-by: Thomas Citharel --- js/src/views/Group/GroupView.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/js/src/views/Group/GroupView.vue b/js/src/views/Group/GroupView.vue index 8c77d403..4e826a8f 100644 --- a/js/src/views/Group/GroupView.vue +++ b/js/src/views/Group/GroupView.vue @@ -716,6 +716,7 @@ const { result, subscribeToMore } = useQuery<{ () => ({ enabled: currentActor.value?.id !== undefined && + currentActor.value?.id !== null && group.value?.preferredUsername !== undefined && usernameWithDomain(group.value) !== "", }) From 6e1687a651fb69b5af80f5bc2264ca8b6f0e14d7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 7 Nov 2022 11:29:15 +0100 Subject: [PATCH 3/4] Fix order of useHead registration on JoinGroupWithAccount view Signed-off-by: Thomas Citharel --- js/src/components/Group/JoinGroupWithAccount.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/js/src/components/Group/JoinGroupWithAccount.vue b/js/src/components/Group/JoinGroupWithAccount.vue index 05459327..488cc9ca 100644 --- a/js/src/components/Group/JoinGroupWithAccount.vue +++ b/js/src/components/Group/JoinGroupWithAccount.vue @@ -26,6 +26,14 @@ const { group } = useGroup(props.preferredUsername); const { t } = useI18n({ useScope: "global" }); +const groupTitle = computed((): undefined | string => { + return group && displayName(group.value); +}); + +const uri = computed((): string | undefined => { + return group.value?.url; +}); + useHead({ title: computed(() => t("Join group {group}", { @@ -33,12 +41,4 @@ useHead({ }) ), }); - -const uri = computed((): string | undefined => { - return group.value?.url; -}); - -const groupTitle = computed((): undefined | string => { - return group && displayName(group.value); -}); From 196e76c0e3b19dd533254b525a73eaea22d424d1 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 7 Nov 2022 11:29:43 +0100 Subject: [PATCH 4/4] Fix profile@instance translation Signed-off-by: Thomas Citharel --- js/src/i18n/en_US.json | 2 +- js/src/i18n/fr_FR.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json index bf373991..d319d7ac 100644 --- a/js/src/i18n/en_US.json +++ b/js/src/i18n/en_US.json @@ -1437,7 +1437,7 @@ "No groups found for {search}": "No groups found for {search}", "No event found at this address": "No event found at this address", "I have an account on {instance}.": "I have an account on {instance}.", - "profile{\\'@\\'}instance": "profile{\\'@\\'}instance", + "profile{'@'}instance": "profile{'@'}instance", "My federated identity ends in {domain}": "My federated identity ends in {domain}", "Close map": "Close map", "On foot": "On foot", diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json index 16303667..66f9adf9 100644 --- a/js/src/i18n/fr_FR.json +++ b/js/src/i18n/fr_FR.json @@ -1341,7 +1341,7 @@ "more than 1360 contributors": "plus de 1360 contributeur·rice·s", "multitude of interconnected Mobilizon websites": "multitude de sites web Mobilizon interconnectés", "new{'@'}email.com": "nouvel{'@'}email.com", - "profile{\\'@\\'}instance": "profil{\\'@\\'}instance", + "profile{'@'}instance": "profil{'@'}instance", "report #{report_number}": "le signalement #{report_number}", "return to the event's page": "retourner sur la page de l'événement", "return to the homepage": "retour à la page d'accueil",