logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 44bddf6cd2ebe636ef58855949128d37244f04a7
parent 7f3fd9ca21b1365f3cc6222c18fe700660dd5881
Author: Shpuld Shpludson <shp@cock.li>
Date:   Mon, 15 Feb 2021 06:20:55 +0000

Merge branch 'fix/usercard-use-general-roles' into 'develop'

User card: use general.role instead of card-specific roles

See merge request pleroma/pleroma-fe!1344

Diffstat:

Msrc/components/user_card/user_card.vue2+-
Msrc/i18n/en.json4----
Msrc/i18n/it.json12++++++------
Msrc/i18n/pt.json13+++++++------
Msrc/i18n/ru.json12++++++------
Msrc/i18n/uk.json12++++++------
6 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue @@ -83,7 +83,7 @@ v-if="!!visibleRole" class="alert user-role" > - {{ $t(`user_card.roles.${visibleRole}`) }} + {{ $t(`general.role.${visibleRole}`) }} </span> <span v-if="user.bot" diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -737,10 +737,6 @@ "quarantine": "Disallow user posts from federating", "delete_user": "Delete user", "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone." - }, - "roles": { - "admin": "Admin", - "moderator": "Moderator" } }, "user_profile": { diff --git a/src/i18n/it.json b/src/i18n/it.json @@ -17,7 +17,11 @@ "close": "Chiudi", "retry": "Riprova", "error_retry": "Per favore, riprova", - "loading": "Carico…" + "loading": "Carico…", + "role": { + "moderator": "Moderatore", + "admin": "Amministratore" + } }, "nav": { "mentions": "Menzioni", @@ -487,11 +491,7 @@ "follow_progress": "Richiedo…", "follow_sent": "Richiesta inviata!", "favorites": "Preferiti", - "message": "Contatta", - "roles": { - "moderator": "Moderatore", - "admin": "Amministratore" - } + "message": "Contatta" }, "chat": { "title": "Chat" diff --git a/src/i18n/pt.json b/src/i18n/pt.json @@ -35,7 +35,12 @@ "retry": "Tenta novamente", "error_retry": "Por favor, tenta novamente", "loading": "A carregar…", - "dismiss": "Ignorar" + "dismiss": "Ignorar", + "role": + { + "moderator": "Moderador", + "admin": "Admin" + } }, "image_cropper": { "crop_picture": "Cortar imagem", @@ -615,11 +620,7 @@ "report": "Denunciar", "message": "Mensagem", "mention": "Mencionar", - "hidden": "Ocultar", - "roles": { - "moderator": "Moderador", - "admin": "Admin" - } + "hidden": "Ocultar" }, "user_profile": { "timeline_title": "Cronologia do Utilizador", diff --git a/src/i18n/ru.json b/src/i18n/ru.json @@ -24,7 +24,11 @@ "retry": "Попробуйте еще раз", "error_retry": "Пожалуйста попробуйте еще раз", "close": "Закрыть", - "loading": "Загрузка…" + "loading": "Загрузка…", + "role": { + "moderator": "Модератор", + "admin": "Администратор" + } }, "login": { "login": "Войти", @@ -541,11 +545,7 @@ "mention": "Упомянуть", "show_repeats": "Показывать повторы", "hide_repeats": "Скрыть повторы", - "report": "Пожаловаться", - "roles": { - "moderator": "Модератор", - "admin": "Администратор" - } + "report": "Пожаловаться" }, "user_profile": { "timeline_title": "Лента пользователя" diff --git a/src/i18n/uk.json b/src/i18n/uk.json @@ -17,7 +17,11 @@ "more": "Більше", "submit": "Відправити", "apply": "Застосувати", - "peek": "Глянути" + "peek": "Глянути", + "role": { + "moderator": "Модератор", + "admin": "Адміністратор" + } }, "finder": { "error_fetching_user": "Користувача не знайдено", @@ -760,11 +764,7 @@ "unblock": "Розблокувати", "remote_follow": "Підписатись", "muted": "Заглушений", - "mute": "Заглушити", - "roles": { - "moderator": "Модератор", - "admin": "Адміністратор" - } + "mute": "Заглушити" }, "status": { "copy_link": "Скопіювати посилання на допис",