diff --git a/js/src/components/Discussion/DiscussionListItem.vue b/js/src/components/Discussion/DiscussionListItem.vue index 8edd0559c..c8efe750a 100644 --- a/js/src/components/Discussion/DiscussionListItem.vue +++ b/js/src/components/Discussion/DiscussionListItem.vue @@ -98,10 +98,9 @@ export default class DiscussionListItem extends Vue { .discussion-minimalist-title { color: #3c376e; - font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, - Arial, serif; - font-size: 1.25rem; - font-weight: 700; + font-family: Roboto, Helvetica, Arial, serif; + font-size: 16px; + font-weight: 500; flex: 1; } } diff --git a/js/src/components/Post/PostListItem.vue b/js/src/components/Post/PostListItem.vue index 76cd1c3d1..daa1024a3 100644 --- a/js/src/components/Post/PostListItem.vue +++ b/js/src/components/Post/PostListItem.vue @@ -43,10 +43,9 @@ export default class PostListItem extends Vue { .post-minimalist-title { color: #3c376e; - font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial, - serif; - font-size: 1rem; - font-weight: 700; + font-family: Roboto, Helvetica, Arial, serif; + font-size: 16px; + font-weight: 500; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json index b0d59b1b4..3cf0514d1 100644 --- a/js/src/i18n/en_US.json +++ b/js/src/i18n/en_US.json @@ -1046,6 +1046,6 @@ "Move resource to the root folder": "Move resource to the root folder", "Share this group": "Share this group", "This group is accessible only through it's link. Be careful where you post this link.": "This group is accessible only through it's link. Be careful where you post this link.", - "{count} members": "{count} members", + "{count} members": "No members|One member|{count} members", "Share": "Share" } diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json index 72989cfbd..2215a30c7 100644 --- a/js/src/i18n/fr_FR.json +++ b/js/src/i18n/fr_FR.json @@ -1137,6 +1137,6 @@ "Move resource to the root folder": "Déplacer la resource dans le dossier racine", "Share this group": "Partager ce groupe", "This group is accessible only through it's link. Be careful where you post this link.": "Ce groupe est accessible uniquement à travers son lien. Faites attention où vous le diffusez.", - "{count} members": "{count} membres", + "{count} members": "Aucun membre|Un⋅e membre|{count} membres", "Share": "Partager" } diff --git a/js/src/mixins/group.ts b/js/src/mixins/group.ts index c6e9f6024..b287fbd84 100644 --- a/js/src/mixins/group.ts +++ b/js/src/mixins/group.ts @@ -5,13 +5,7 @@ import { } from "@/graphql/actor"; import { FETCH_GROUP } from "@/graphql/group"; import RouteName from "@/router/name"; -import { - Group, - IActor, - IGroup, - IPerson, - usernameWithDomain, -} from "@/types/actor"; +import { IActor, IGroup, IPerson, usernameWithDomain } from "@/types/actor"; import { MemberRole } from "@/types/enums"; import { Component, Vue } from "vue-property-decorator"; @@ -50,14 +44,14 @@ const now = new Date(); variables() { return { actorId: this.currentActor.id, - group: this.group.preferredUsername, + group: this.group?.preferredUsername, }; }, skip() { return ( !this.currentActor || !this.currentActor.id || - !this.group.preferredUsername + !this.group?.preferredUsername ); }, }, @@ -65,7 +59,7 @@ const now = new Date(); return ( !this.currentActor || !this.currentActor.id || - !this.group.preferredUsername + !this.group?.preferredUsername ); }, }, @@ -73,7 +67,7 @@ const now = new Date(); }, }) export default class GroupMixin extends Vue { - group: IGroup = new Group(); + group!: IGroup; currentActor!: IActor; diff --git a/js/src/types/actor/actor.model.ts b/js/src/types/actor/actor.model.ts index df1ed3cae..9b732a901 100644 --- a/js/src/types/actor/actor.model.ts +++ b/js/src/types/actor/actor.model.ts @@ -57,7 +57,8 @@ export class Actor implements IActor { } export function usernameWithDomain(actor: IActor, force = false): string { - if (actor.domain) { + if (!actor) return ""; + if (actor?.domain) { return `${actor.preferredUsername}@${actor.domain}`; } if (force) { diff --git a/js/src/views/Group/Group.vue b/js/src/views/Group/Group.vue index 1e1d416aa..9d7e82861 100644 --- a/js/src/views/Group/Group.vue +++ b/js/src/views/Group/Group.vue @@ -10,7 +10,7 @@
{{ $t("No public upcoming events") }}
-{{ $t("No posts yet") }}
-{{ $t("No posts yet") }}
-