+
-
-
+
- {{ $t("Default") }}
+ {{ t("Default") }}
{{ $t("default Mobilizon terms") }}{{ t("default Mobilizon terms") }}
{{
- $t(
+ t(
"NOTE! The default terms have not been checked over by a lawyer and thus are unlikely to provide full legal protection for all situations for an instance admin using them. They are also not specific to all countries and jurisdictions. If you are unsure, please check with a lawyer."
)
}}
-
+
-
{{ $t("URL") }}
+
{{ t("URL") }}
- {{ $t("Set an URL to a page with your own terms.") }}
+ {{ t("Set an URL to a page with your own terms.") }}
- {{ $t("Custom") }}
+ {{ t("Custom") }}
- {{ $t("default Mobilizon terms") }}
@@ -225,7 +221,7 @@
@@ -236,7 +232,7 @@
/>
@@ -246,19 +242,19 @@
id="instanceTerms"
/>
-
-
-
+
+
+
-
+
-
{{ $t("Default") }}
+
{{ t("Default") }}
{{ $t("default Mobilizon privacy policy") }}{{ t("default Mobilizon privacy policy") }}
@@ -310,9 +306,9 @@
InstancePrivacyType.URL
"
>
-
{{ $t("URL") }}
+
{{ t("URL") }}
- {{ $t("Set an URL to a page with your own privacy policy.") }}
+ {{ t("Set an URL to a page with your own privacy policy.") }}
{{
- $t("Save")
+ t("Save")
}}
@@ -390,29 +386,30 @@ import { useMutation, useQuery } from "@vue/apollo-composable";
import { ref, computed, watch, inject } from "vue";
import { useI18n } from "vue-i18n";
import { useHead } from "@vueuse/head";
-import { Notifier } from "@/plugins/notifier";
+import type { Notifier } from "@/plugins/notifier";
+
+const defaultAdminSettings: IAdminSettings = {
+ instanceName: "",
+ instanceDescription: "",
+ instanceSlogan: "",
+ instanceLongDescription: "",
+ contact: "",
+ instanceTerms: "",
+ instanceTermsType: InstanceTermsType.DEFAULT,
+ instanceTermsUrl: null,
+ instancePrivacyPolicy: "",
+ instancePrivacyPolicyType: InstancePrivacyType.DEFAULT,
+ instancePrivacyPolicyUrl: null,
+ instanceRules: "",
+ registrationsOpen: false,
+ instanceLanguages: [],
+};
const { result: adminSettingsResult } = useQuery<{
adminSettings: IAdminSettings;
}>(ADMIN_SETTINGS);
const adminSettings = computed(
- () =>
- adminSettingsResult.value?.adminSettings ?? {
- instanceName: "",
- instanceDescription: "",
- instanceSlogan: "",
- instanceLongDescription: "",
- contact: "",
- instanceTerms: "",
- instanceTermsType: InstanceTermsType.DEFAULT,
- instanceTermsUrl: null,
- instancePrivacyPolicy: "",
- instancePrivacyPolicyType: InstanceTermsType.DEFAULT,
- instancePrivacyPolicyUrl: null,
- instanceRules: "",
- registrationsOpen: false,
- instanceLanguages: [],
- }
+ () => adminSettingsResult.value?.adminSettings ?? defaultAdminSettings
);
const { result: languageResult } = useQuery<{ languages: ILanguage[] }>(
@@ -425,10 +422,10 @@ useHead({
title: computed(() => t("Settings")),
});
-const settingsToWrite = ref({ ...adminSettings });
+const settingsToWrite = ref(defaultAdminSettings);
watch(adminSettings, () => {
- // settingsToWrite.value = { ...adminSettings.value };
+ settingsToWrite.value = { ...adminSettings.value };
});
const filteredLanguages = ref([]);
diff --git a/js/src/views/Admin/Users.vue b/js/src/views/Admin/Users.vue
index 527476cba..4c3ccb075 100644
--- a/js/src/views/Admin/Users.vue
+++ b/js/src/views/Admin/Users.vue
@@ -196,7 +196,6 @@ a.user-profile {
text-decoration: none;
}
a.disabled {
- color: $danger;
text-decoration: line-through;
}
diff --git a/js/src/views/Event/Edit.vue b/js/src/views/Event/Edit.vue
index d5747331d..ec5dbd70e 100644
--- a/js/src/views/Event/Edit.vue
+++ b/js/src/views/Event/Edit.vue
@@ -496,7 +496,6 @@
diff --git a/js/src/views/HomeView.vue b/js/src/views/HomeView.vue
index 402d5146e..b8a45267b 100644
--- a/js/src/views/HomeView.vue
+++ b/js/src/views/HomeView.vue
@@ -288,12 +288,12 @@
diff --git a/js/src/views/Interact.vue b/js/src/views/Interact.vue
index c91e78151..c18d71f5a 100644
--- a/js/src/views/Interact.vue
+++ b/js/src/views/Interact.vue
@@ -99,8 +99,3 @@ useHead({
title: computed(() => t("Interact with a remote content")),
});
-
diff --git a/js/src/views/Moderation/Logs.vue b/js/src/views/Moderation/Logs.vue
index c2433824d..142d7ad5f 100644
--- a/js/src/views/Moderation/Logs.vue
+++ b/js/src/views/Moderation/Logs.vue
@@ -214,7 +214,7 @@
log.object.__typename == 'Group'
"
tag="span"
- path="{moderator} suspended group {profile}"
+ keypath="{moderator} suspended group {profile}"
>
{