From ee50fec2c1bc59874a305dc4ef062120eca1cb37 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 6 Sep 2015 10:11:28 -0500 Subject: [PATCH] Tweak wording of custom day start warning --- common/locales/en/settings.json | 4 +--- website/views/options/settings.jade | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json index 4eb0af141c..10026384f6 100644 --- a/common/locales/en/settings.json +++ b/common/locales/en/settings.json @@ -42,9 +42,7 @@ "changeCustomDayStart": "Change Custom Day Start?", "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?", "nextCron": "Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before this time!", - "24HrClock": "24Hr Clock", - "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. It is recommended that you read the following information before changing it: ", - "customDayStartInfo4": "Complete all your Dailies before changing the Custom Day Start or Rest in the Inn that day. Changing your Custom Day Start may cause Cron to run immediately, but after the first day it works as expected.

Allow a window of two hours for the change to take effect. For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.

Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.", + "customDayStartInfo1": "Habitica defaults to check and reset your Dailies at midnight in your own time zone each day. You can customize that time here.", "misc": "Misc", "showHeader": "Show Header", "changePass": "Change Password", diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade index b02eaf92b2..beb0895604 100644 --- a/website/views/options/settings.jade +++ b/website/views/options/settings.jade @@ -86,12 +86,9 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') hr h5=env.t('customDayStart') - .alert.alert-warning - h5=env.t('customDayStartInfo1') - a(ng-click='showCustomDayStartInfo = !showCustomDayStartInfo') {{!showCustomDayStartInfo ? env.t('showMoreMore') : env.t('showMoreLess')}} - h5(ng-if='showCustomDayStartInfo')!=env.t('customDayStartInfo4') - .form-horizontal + alert.alert-warning=env.t('customDayStartInfo1') + .form-horizontal .form-group .col-sm-7 select.form-control(ng-model='dayStart')