mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
refactor(translations): Fix keys for muting
Provide the correct German translation. Remove "" and use `null` for Italian. @mattwr18 we really have to make sure not to add empty strings to our translations because we disable the fallback in that case. Also, if we want, we could replace the other translations with `null` in order to make sure that we have the better (though untranslated) explanation. @mattwr18 I had a look into `notificationsMiddleware.js`. I think that we can still keep the tests and the behaviour although there is no `BLOCKED` relationship anymore, right?
This commit is contained in:
roschaefer
parent
e4cb7eb52a
commit
c22a6330aa
@ -146,25 +146,22 @@
|
||||
"successDelete": "Social-Media gelöscht. Profil aktualisiert!"
|
||||
},
|
||||
"muted-users": {
|
||||
"name": "Blockierte Benutzer",
|
||||
"name": "Stummgeschaltete Benutzer",
|
||||
"explanation": {
|
||||
"intro": "Wenn ein anderer Benutzer von dir blockiert wurde, dann passiert folgendes:",
|
||||
"your-perspective": "In deiner Beitragsübersicht tauchen keine Beiträge der blockierten Person mehr auf.",
|
||||
"their-perspective": "Umgekehrt das gleiche: Die blockierte Person sieht deine Beiträge auch nicht mehr in ihrer Übersicht.",
|
||||
"search": "Die Beiträge von blockierten Personen verschwinden aus deinen Suchergebnissen.",
|
||||
"notifications": "Von dir blockierte Personen erhalten keine Benachrichtigungen mehr, wenn sie in deinen Beiträgen erwähnt werden.",
|
||||
"closing": "Das sollte fürs Erste genügen, damit blockierte Benutzer dich nicht mehr länger belästigen können."
|
||||
"intro": "Wenn ein anderer Benutzer von dir stummgeschaltet wurde, dann passiert folgendes:",
|
||||
"your-perspective": "In deiner Beitragsübersicht tauchen keine Beiträge der stummgeschalteten Person mehr auf.",
|
||||
"search": "Die Beiträge von stummgeschalteten Personen verschwinden aus deinen Suchergebnissen."
|
||||
},
|
||||
"columns": {
|
||||
"name": "Name",
|
||||
"slug": "Alias",
|
||||
"unmute": "Entsperren"
|
||||
},
|
||||
"empty": "Bislang hast du niemanden blockiert.",
|
||||
"how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü blockieren.",
|
||||
"mute": "Nutzer blockieren",
|
||||
"unmute": "Nutzer entblocken",
|
||||
"unblocked": "{name} ist wieder entsperrt"
|
||||
"empty": "Bislang hast du niemanden stummgeschaltet.",
|
||||
"how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü stummschalten.",
|
||||
"mute": "Stumm schalten",
|
||||
"unmute": "Stummschaltung aufheben",
|
||||
"unmuted": "{name} ist nicht mehr stummgeschaltet"
|
||||
},
|
||||
"privacy": {
|
||||
"name": "Privatsphäre",
|
||||
|
||||
@ -318,10 +318,7 @@
|
||||
"explanation": {
|
||||
"intro": "If another user has been muted by you, this is what happens:",
|
||||
"your-perspective": "The muted person's posts will no longer appear in your news feed.",
|
||||
"their-perspective": "However: The muted person will still be able to see your posts in their news feed.",
|
||||
"search": "Posts of muted people disappear from your search results.",
|
||||
"notifications": "Muted users will still receive notifications if they are mentioned in your posts.",
|
||||
"closing": "This should be sufficient for filtering out content from muted users."
|
||||
"search": "Posts of muted people disappear from your search results."
|
||||
},
|
||||
"columns": {
|
||||
"name": "Name",
|
||||
|
||||
@ -150,10 +150,7 @@
|
||||
"explanation": {
|
||||
"intro": "Si otro usuario ha sido bloqueado por usted, esto es lo que sucede:",
|
||||
"your-perspective": "Las contribuciones de la persona bloqueada no aparecerán más en su canal de noticias.",
|
||||
"their-perspective": "Viceversa: la persona bloqueada tampoco verá más sus contribuciones en sus noticias.",
|
||||
"search": "Las contribuciones de personas bloqueadas desaparecen de los resultados de búsqueda.",
|
||||
"notifications": "Los usuarios bloqueados no recibirán más notificaciones si se mencionan en sus contribuciones.",
|
||||
"closing": "Esto debería ser suficiente por ahora para que los usuarios bloqueados no puedan molestarle más."
|
||||
"search": "Las contribuciones de personas bloqueadas desaparecen de los resultados de búsqueda."
|
||||
},
|
||||
"columns": {
|
||||
"name": "Nombre",
|
||||
@ -164,7 +161,7 @@
|
||||
"how-to": "Puede bloquear a otros usuarios en la página de perfil de aquellos a través del menú de contenido.",
|
||||
"mute": "Bloquear usuario",
|
||||
"unmute": "Desbloquear usuario",
|
||||
"unblocked": "{name} está desbloqueado nuevamente"
|
||||
"unmuted": "{name} está desbloqueado nuevamente"
|
||||
},
|
||||
"privacy": {
|
||||
"name": "Privacidad",
|
||||
|
||||
@ -150,10 +150,7 @@
|
||||
"explanation": {
|
||||
"intro": "Si vous avez bloqué un autre utilisateur, voici ce qui se passe:",
|
||||
"your-perspective": "Les postes de la personne bloquée n'apparaîtront dans votre fil d'actualités.",
|
||||
"their-perspective": "Vice versa: la personne bloquée ne verra plus non plus vos postes dans son fil d'actualités.",
|
||||
"search": "Les postes des personnes bloquées disparaissent de vos résultats de recherche.",
|
||||
"notifications": "Les utilisateurs bloqués ne recevront plus de notifications s'ils sont mentionnés dans vos postes.",
|
||||
"closing": "Ceci devrait être suffisant pour le moment afin que les utilisateurs bloqués ne puissent plus vous déranger."
|
||||
"search": "Les postes des personnes bloquées disparaissent de vos résultats de recherche."
|
||||
},
|
||||
"columns": {
|
||||
"name": "Nom",
|
||||
|
||||
@ -146,25 +146,22 @@
|
||||
"successDelete": "Social media cancellati. Profilo utente aggiornato!"
|
||||
},
|
||||
"muted-users": {
|
||||
"name": "",
|
||||
"name": null,
|
||||
"explanation": {
|
||||
"intro": "",
|
||||
"your-perspective": "",
|
||||
"their-perspective": "",
|
||||
"search": "",
|
||||
"notifications": "",
|
||||
"closing": ""
|
||||
"intro": null,
|
||||
"your-perspective": null,
|
||||
"search": null
|
||||
},
|
||||
"columns": {
|
||||
"name": "",
|
||||
"slug": "",
|
||||
"unmute": ""
|
||||
"name": null,
|
||||
"slug": null,
|
||||
"unmute": null
|
||||
},
|
||||
"empty": "",
|
||||
"how-to": "",
|
||||
"mute": "",
|
||||
"unmute": "",
|
||||
"unmuted": ""
|
||||
"empty": null,
|
||||
"how-to": null,
|
||||
"mute": null,
|
||||
"unmute": null,
|
||||
"unmuted": null
|
||||
},
|
||||
"privacy": {
|
||||
"name": "",
|
||||
|
||||
@ -150,10 +150,7 @@
|
||||
"explanation": {
|
||||
"intro": "Se outro usuário foi bloqueado por você, isto é o que acontece:",
|
||||
"your-perspective": "As mensagens da pessoa bloqueada não aparecerão mais no seu feed de notícias.",
|
||||
"their-perspective": "Vice versa: A pessoa bloqueada também não verá mais suas mensagens em seu feed de notícias.",
|
||||
"search": "Publicações de pessoas bloqueadas desaparecem dos resultados da sua pesquisa.",
|
||||
"notifications": "Usuários bloqueados não receberão mais notificações se forem mencionados em suas mensagens.",
|
||||
"closing": "Isso deve ser suficiente por enquanto para que os usuários bloqueados não possam mais incomodá-lo."
|
||||
"search": "Publicações de pessoas bloqueadas desaparecem dos resultados da sua pesquisa."
|
||||
},
|
||||
"columns": {
|
||||
"name": "Nome",
|
||||
|
||||
@ -605,11 +605,8 @@
|
||||
},
|
||||
"empty": "Вы пока никого не блокировали.",
|
||||
"explanation": {
|
||||
"closing": "На данный момент этого должно быть достаточно, чтобы заблокированные пользователи больше вас не беспокоили.",
|
||||
"intro": "Если блокируете другого пользователя, происходит следующее:",
|
||||
"notifications": "Заблокированные пользователи больше не будут получать уведомления об упоминаниях в ваших постах.",
|
||||
"search": "Посты заблокированных пользователей не отображаются в результатах поиска.",
|
||||
"their-perspective": "И наоборот — заблокированный пользователь больше не видит ваши посты в своей ленте.",
|
||||
"your-perspective": "Посты заблокированного пользователя не отображаются в персональной ленте."
|
||||
},
|
||||
"how-to": "Вы можете блокировать других пользователей на странице их профиля с помощью меню профиля.",
|
||||
|
||||
@ -74,7 +74,7 @@
|
||||
@update="updateFollow"
|
||||
/>
|
||||
<base-button v-else @click="unmuteUser(user)" class="unblock-user-button">
|
||||
{{ $t('settings.blocked-users.unblock') }}
|
||||
{{ $t('settings.muted-users.unmute') }}
|
||||
</base-button>
|
||||
</template>
|
||||
</ds-space>
|
||||
|
||||
@ -9,19 +9,10 @@
|
||||
<ds-list-item>
|
||||
{{ $t('settings.muted-users.explanation.your-perspective') }}
|
||||
</ds-list-item>
|
||||
<ds-list-item>
|
||||
{{ $t('settings.muted-users.explanation.their-perspective') }}
|
||||
</ds-list-item>
|
||||
<ds-list-item>
|
||||
{{ $t('settings.muted-users.explanation.search') }}
|
||||
</ds-list-item>
|
||||
<ds-list-item>
|
||||
{{ $t('settings.muted-users.explanation.notifications') }}
|
||||
</ds-list-item>
|
||||
</ds-list>
|
||||
<ds-text>
|
||||
{{ $t('settings.muted-users.explanation.closing') }}
|
||||
</ds-text>
|
||||
</ds-card>
|
||||
</ds-space>
|
||||
<ds-card v-if="mutedUsers && mutedUsers.length">
|
||||
@ -111,7 +102,7 @@ export default {
|
||||
})
|
||||
this.$apollo.queries.mutedUsers.refetch()
|
||||
const { name } = user.row
|
||||
this.$toast.success(this.$t('settings.muted-users.unblocked', { name }))
|
||||
this.$toast.success(this.$t('settings.muted-users.unmuted', { name }))
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user