logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 6281241b92bc17a9535b15a52e656b9f218e3322
parent fb183adc741419fec21e2df60a5fa98084983a13
Author: Shpuld Shpludson <shp@cock.li>
Date:   Thu,  4 Mar 2021 20:02:57 +0000

Merge branch 'feat/user-highlight-localizable' into 'develop'

Make it possible to localize user highlight options

See merge request pleroma/pleroma-fe!1369

Diffstat:

Msrc/components/user_card/user_card.vue8++++----
Msrc/i18n/en.json6++++++
2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue @@ -141,10 +141,10 @@ v-model="userHighlightType" class="userHighlightSel" > - <option value="disabled">No highlight</option> - <option value="solid">Solid bg</option> - <option value="striped">Striped bg</option> - <option value="side">Side stripe</option> + <option value="disabled">{{ $t('user_card.highlight.disabled') }}</option> + <option value="solid">{{ $t('user_card.highlight.solid') }}</option> + <option value="striped">{{ $t('user_card.highlight.striped') }}</option> + <option value="side">{{ $t('user_card.highlight.side') }}</option> </select> <FAIcon class="select-down-icon" diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -746,6 +746,12 @@ "quarantine": "Disallow user posts from federating", "delete_user": "Delete user", "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone." + }, + "highlight": { + "disabled": "No highlight", + "solid": "Solid bg", + "striped": "Striped bg", + "side": "Side stripe" } }, "user_profile": {