sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-22 05:38:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5007 from stillsnowedin/develop

Browse source 
Updated the custom day start information in settings. (#5006)
This commit is contained in:
Alys 2015-04-19 15:02:37 +10:00
commit 175ec9bb46
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/locales/en/settings.json
View file

@ -41,7 +41,10 @@
"json": "(JSON)",
"customDayStart": "Custom Day Start",
"24HrClock": "24Hr Clock",
"clockInfo": "HabitRPG defaults to check and reset your Dailies at midnight each day. You can customize that here (Enter number between 0 and 24).",
"customDayStartInfo1": "HabitRPG 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: ",
"customDayStartInfo2": "(show more)",
"customDayStartInfo3": "(show less)",
"customDayStartInfo4": "<strong>Complete all your Dailies before changing the Custom Day Start</strong> or <a href='http://habitrpg.wikia.com/wiki/Rest_in_the_Inn' target='_blank'>Rest in the Inn</a> that day. Changing your Custom Day Start may cause <a href='http://habitrpg.wikia.com/wiki/Cron' target='_blank'>Cron</a> to run immediately, but after the first day it works as expected.<br><br><strong>Allow a window of two hours for the change to take effect.</strong> 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.<br><br>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.",
"misc": "Misc",
"showHeader": "Show Header",
"changePass": "Change Password",

3
common/locales/en/subscriber.json
View file

@ -2,9 +2,6 @@
"subscription": "Subscription",
"subscriptions": "Subscriptions",
"subDescription": "Disable ads, buy gems with gold, monthly mystery item, retain progress history, double daily drop-caps, supports the devs. Click for more info.",
"subWarning1": "Warning: this is a highly-experimental feature, and many",
"subWarning2": "experience issues",
"subWarning3": "with it.",
"disableAds": "Disable ads",
"disableAdsText": "Ads will stay disabled while you have an active subscription (original users with disabled ads are grandfathered).",
"buyGemsGold": "Buy Gems with Gold",

11
website/views/options/settings.jade
View file

@ -74,17 +74,14 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
button.btn.btn-default(ng-if='!user.preferences.disableClasses && user.flags.classSelected', ng-click='showClassesTour()', popover-trigger='mouseenter', popover-placement='right', popover=env.t('classTourPop'))= env.t('showClass')
div.alert.alert-warning(style='padding:2px;margin-top:7px')
h5.hint(popover=env.t('clockInfo'), popover-trigger='mouseenter')=env.t('customDayStart')
h5=env.t('customDayStart')
h5=env.t('customDayStartInfo1')
a(ng-click='showCustomDayStartInfo = !showCustomDayStartInfo') {{!showCustomDayStartInfo ? env.t('customDayStartInfo2') : env.t('customDayStartInfo3')}}
h5(ng-if='showCustomDayStartInfo')!=env.t('customDayStartInfo4')
.form-group
.input-group
input.form-control(type='number', min='0', max='23', ng-model='user.preferences.dayStart', ng-blur='saveDayStart()')
span.input-group-addon= ':00 (' + env.t('24HrClock') + ')'
small
=env.t('subWarning1')
|&nbsp;
a(href='https://github.com/HabitRPG/habitrpg/issues/1057' target='_blank')=env.t('subWarning2')
|&nbsp;
=env.t('subWarning3')
.personal-options.col-md-6
.panel.panel-default