From 4fed13afddbc09b06a202e0a3d08ec97851642fe Mon Sep 17 00:00:00 2001 From: Alys Date: Sat, 1 Apr 2017 02:06:22 +1000 Subject: [PATCH] add note to encourage reporting of begging for gems (#8605) Also changes the email addresses in config.json.example to the real addresses so that we can use local install screenshots to tell if the correct address variable has been used. --- config.json.example | 6 +++--- website/common/locales/en/groups.json | 1 + website/views/shared/modals/members.jade | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config.json.example b/config.json.example index 9749bb914e..693ca851c7 100644 --- a/config.json.example +++ b/config.json.example @@ -94,8 +94,8 @@ }, "ITUNES_SHARED_SECRET": "aaaabbbbccccddddeeeeffff00001111", "EMAILS" : { - "COMMUNITY_MANAGER_EMAIL" : "community@example.com", - "TECH_ASSISTANCE_EMAIL" : "tech@example.com", - "PRESS_ENQUIRY_EMAIL" : "press@example.com" + "COMMUNITY_MANAGER_EMAIL" : "leslie@habitica.com", + "TECH_ASSISTANCE_EMAIL" : "admin@habitica.com", + "PRESS_ENQUIRY_EMAIL" : "leslie@habitica.com" } } diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index ee0ab2f624..87c82d5152 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -155,6 +155,7 @@ "sendGiftPurchase": "Purchase", "sendGiftMessagePlaceholder": "Personal message (optional)", "sendGiftSubscription": "<%= months %> Month(s): $<%= price %> USD", + "gemGiftsAreOptional": "Please note that Habitica will never require you to gift gems to other players. Begging people for gems is a violation of the Community Guidelines, and all such instances should be reported to <%= hrefTechAssistanceEmail %>.", "battleWithFriends": "Battle Monsters With Friends", "startPartyWithFriends": "Start a Party with your friends!", "startAParty": "Start a Party", diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade index bd45fa87d6..1e761661af 100644 --- a/website/views/shared/modals/members.jade +++ b/website/views/shared/modals/members.jade @@ -79,6 +79,9 @@ script(type='text/ng-template', id='modals/send-gift.html') .btn-group a.btn.btn-default(ng-class="{active:gift.gems.fromBalance}", ng-click="gift.gems.fromBalance=true")=env.t('sendGiftFromBalance') a.btn.btn-default(ng-class="{active:!gift.gems.fromBalance}", ng-click="gift.gems.fromBalance=false")=env.t('sendGiftPurchase') + .row + .col-md-12 + p.small.muted!=env.t('gemGiftsAreOptional', { hrefTechAssistanceEmail : '' + env.EMAILS.TECH_ASSISTANCE_EMAIL + ''}) .panel.panel-default(class="{{gift.type=='subscription' ? 'panel-primary' : 'transparent'}}", ng-click='gift.type="subscription"') .panel-heading=env.t('subscription')