diff --git a/webapp/components/CategoriesSelect/CategoriesSelect.vue b/webapp/components/CategoriesSelect/CategoriesSelect.vue index ce1c6a77d..4f7a555a3 100644 --- a/webapp/components/CategoriesSelect/CategoriesSelect.vue +++ b/webapp/components/CategoriesSelect/CategoriesSelect.vue @@ -74,7 +74,7 @@ export default { return CategoryQuery() }, result({ data: { Category } }) { - this.categories = this.sortCategories(Category, this.$t) + this.categories = this.sortCategories(Category) }, }, }, diff --git a/webapp/components/FilterMenu/CategoriesFilter.vue b/webapp/components/FilterMenu/CategoriesFilter.vue index 0d1c4301a..5db8d1fdd 100644 --- a/webapp/components/FilterMenu/CategoriesFilter.vue +++ b/webapp/components/FilterMenu/CategoriesFilter.vue @@ -86,7 +86,7 @@ export default { }, update({ Category }) { if (!Category) return [] - this.categories = this.sortCategories(Category, this.$t) + this.categories = this.sortCategories(Category) }, fetchPolicy: 'cache-and-network', }, diff --git a/webapp/mixins/sortCategoriesMixin.js b/webapp/mixins/sortCategoriesMixin.js index 1cc998777..2a22a8610 100644 --- a/webapp/mixins/sortCategoriesMixin.js +++ b/webapp/mixins/sortCategoriesMixin.js @@ -1,19 +1,19 @@ export default { methods: { - sortCategories(categories, locales) { + sortCategories(categories) { const miscSlug = 'miscellaneous' const misc = categories.find((cat) => cat.slug === miscSlug) const sortedCategories = categories .filter((cat) => cat.slug !== miscSlug) .sort((a, b) => { if ( - locales(`contribution.category.name.${a.slug}`) < - locales(`contribution.category.name.${b.slug}`) + this.$t(`contribution.category.name.${a.slug}`) < + this.$t(`contribution.category.name.${b.slug}`) ) return -1 if ( - locales(`contribution.category.name.${a.slug}`) > - locales(`contribution.category.name.${b.slug}`) + this.$t(`contribution.category.name.${a.slug}`) > + this.$t(`contribution.category.name.${b.slug}`) ) return 1 return 0 diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue index d1b410081..1b6d66033 100644 --- a/webapp/pages/group/_id/_slug.vue +++ b/webapp/pages/group/_id/_slug.vue @@ -26,10 +26,10 @@ /> + @unmute="unmuteUser" + @block="blockUser" + @unblock="unblockUser" + @delete="deleteUser" --> @@ -65,38 +65,38 @@ + + + + + + --> + + + + + + -->
+ {{ $t('settings.blocked-users.unblock') }} + + + {{ $t('settings.muted-users.unmute') }} + + --> + v-if="!user.isMuted && !user.isBlocked" -->

@@ -161,7 +161,9 @@
@@ -211,19 +213,19 @@ @fetchAllProfiles="fetchAllMembers" /> + + + --> @@ -326,6 +328,7 @@ import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue' import PostTeaser from '~/components/PostTeaser/PostTeaser.vue' import ProfileAvatar from '~/components/_new/generic/ProfileAvatar/ProfileAvatar' import ProfileList from '~/components/features/ProfileList/ProfileList' +import SortCategories from '~/mixins/sortCategoriesMixin.js' // import SocialMedia from '~/components/SocialMedia/SocialMedia' // import TabNavigation from '~/components/_new/generic/TabNavigation/TabNavigation' @@ -356,7 +359,7 @@ export default { // SocialMedia, // TabNavigation, }, - mixins: [postListActions], + mixins: [postListActions, SortCategories], transition: { name: 'slide-up', mode: 'out-in', diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue index 50cf0f154..6e104bc53 100644 --- a/webapp/pages/post/_id/_slug/index.vue +++ b/webapp/pages/post/_id/_slug/index.vue @@ -61,7 +61,7 @@