Merge branch 'fixes' into 'main'

Register missing BellOutline and BellOffOutline icons

See merge request framasoft/mobilizon!1332

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);
-});
 </script>

js/src/components/core/MaterialIcon.vue

@@ -240,6 +240,12 @@ const icons: Record<string, () => Promise<any>> = {
     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(

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",

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",

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) !== "",
   })