krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added copy to detail blocks wont work on mods (#10539)

Browse Source 
* Added copy to detail blocks wont work on mods

* fix(wording): "moderator" clearer than "mod"
This commit is contained in:
Keith Holliday
2018-07-21 08:10:54 -05:00
committed by GitHub
parent 423eafbd4d
commit 62c60ce520
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/userMenu/profile.vue
View File

@@ -8,7 +8,7 @@ div
button.btn.btn-secondary.gift-icon(@click='openSendGemsModal()', v-b-tooltip.hover.bottom="$t('sendGems')") button.btn.btn-secondary.gift-icon(@click='openSendGemsModal()', v-b-tooltip.hover.bottom="$t('sendGems')")
.svg-icon.gift-icon(v-html="icons.gift") .svg-icon.gift-icon(v-html="icons.gift")
button.btn.btn-secondary.remove-icon(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) === -1', button.btn.btn-secondary.remove-icon(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) === -1',
@click="blockUser()", v-b-tooltip.hover.right="$t('block')") @click="blockUser()", v-b-tooltip.hover.right="$t('blockWarning')")
.svg-icon.remove-icon(v-html="icons.remove") .svg-icon.remove-icon(v-html="icons.remove")
button.btn.btn-secondary.positive-icon(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) !== -1', button.btn.btn-secondary.positive-icon(v-if='user._id !== this.userLoggedIn._id && userLoggedIn.inbox.blocks.indexOf(user._id) !== -1',
@click="unblockUser()", v-b-tooltip.hover.right="$t('unblock')") @click="unblockUser()", v-b-tooltip.hover.right="$t('unblock')")

1
website/common/locales/en/groups.json
View File

@@ -143,6 +143,7 @@
"PMDisabledCaptionText": "You can still send messages, but no one can send them to you.", "PMDisabledCaptionText": "You can still send messages, but no one can send them to you.",
"block": "Block", "block": "Block",
"unblock": "Un-block", "unblock": "Un-block",
"blockWarning": "Block - This will have no effect if the player is a moderator now or becomes a moderator in future.",
"pm-reply": "Send a reply", "pm-reply": "Send a reply",
"inbox": "Inbox", "inbox": "Inbox",
"messageRequired": "A message is required.", "messageRequired": "A message is required.",