From 397a293ca89dffe7f0e52504a73ef52a4826bed6 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 20 Feb 2015 18:15:47 +0100 Subject: [PATCH] change text for recapture emails settings --- common/locales/en/settings.json | 2 +- website/src/models/user.js | 1 + website/views/options/settings.jade | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json index 60de66e6d5..16720de7e1 100644 --- a/common/locales/en/settings.json +++ b/common/locales/en/settings.json @@ -93,7 +93,7 @@ "giftedSubscription": "Gifted Subscription", "invitedParty": "Invited To Party", "invitedGuild": "Invited To Guild", - "importantAnnouncements": "Important Announcements", + "inactivityEmails": "Your account is inactive", "questStarted": "Your Quest has Begun", "invitedQuest": "Invited to Quest", "remindersToLogin": "Reminders to check in to HabitRPG", diff --git a/website/src/models/user.js b/website/src/models/user.js index d1445f79e2..5329fe0c16 100644 --- a/website/src/models/user.js +++ b/website/src/models/user.js @@ -311,6 +311,7 @@ var UserSchema = new Schema({ questStarted: {type: Boolean, 'default': true}, invitedQuest: {type: Boolean, 'default': true}, //remindersToLogin: {type: Boolean, 'default': true}, + // Those importantAnnouncements are in fact the recapture emails importantAnnouncements: {type: Boolean, 'default': true} } }, diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade index 50919286f2..92eeaadce9 100644 --- a/website/views/options/settings.jade +++ b/website/views/options/settings.jade @@ -320,10 +320,11 @@ script(id='partials/options.settings.notifications.html', type="text/ng-template input(type='checkbox', ng-disabled='user.preferences.emailNotifications.unsubscribeFromAll === true', ng-model='user.preferences.emailNotifications.remindersToLogin', ng-change='set({"preferences.emailNotifications.remindersToLogin": user.preferences.emailNotifications.remindersToLogin ? true: false})') span=env.t('remindersToLogin') + // These are the recapture emails, important announcements was the previous name used for them .checkbox label input(type='checkbox', ng-disabled='user.preferences.emailNotifications.unsubscribeFromAll === true', ng-model='user.preferences.emailNotifications.importantAnnouncements', ng-change='set({"preferences.emailNotifications.importantAnnouncements": user.preferences.emailNotifications.importantAnnouncements ? true: false})') - span=env.t('importantAnnouncements') + span=env.t('inactivityEmails') hr