aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2021-03-04 20:02:57 +0000
committerShpuld Shpludson <shp@cock.li>2021-03-04 20:02:57 +0000
commit6281241b92bc17a9535b15a52e656b9f218e3322 (patch)
tree0b387ce4e44135517bb4f90d8c1cb5f06e190681 /src
parentfb183adc741419fec21e2df60a5fa98084983a13 (diff)
parentc14c144cc8774fe03bb6dc981fad0470ac1bcebb (diff)
Merge branch 'feat/user-highlight-localizable' into 'develop'
Make it possible to localize user highlight options See merge request pleroma/pleroma-fe!1369
Diffstat (limited to 'src')
-rw-r--r--src/components/user_card/user_card.vue8
-rw-r--r--src/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
index 60776ebb..4b7ee7d5 100644
--- 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
index bf775363..2aefebc9 100644
--- 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": {