sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-29 06:07:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made uneditable habits show counter reset frequency (#8675)

Browse source 
Added counter reset frequency to counter tooltip
Solves issue https://github.com/HabitRPG/habitica/issues/8571
This commit is contained in:
yugensoft 2017-04-22 22:01:06 +03:00 committed by Sabe Jones
parent bde4eafc05
commit 7d3213fd66
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
website/common/locales/en/tasks.json
View file

@ -166,5 +166,6 @@
"groupTasksByChallenge": "Group tasks by challenge title",
"taskNotes": "Task Notes",
"monthlyRepeatHelpContent": "This task will be due every X months",
"yearlyRepeatHelpContent": "This task will be due every X years"
"yearlyRepeatHelpContent": "This task will be due every X years",
"resets": "Resets"
}

3
website/views/shared/tasks/edit/habits/frequency.jade
View file

@ -1,8 +1,7 @@
fieldset.option-group.counter_period(ng-if='task.type === "habit" && canEdit(task) && task._edit._advanced')
fieldset.option-group.counter_period(ng-if='task.type === "habit" && task._edit._advanced')
.form-group
legend.option-title=env.t('counterPeriod')
select.form-control(ng-model='task._edit.frequency', ng-disabled='!canEdit(task)')
option(value='daily')=env.t('counterPeriodDay')
option(value='weekly')=env.t('counterPeriodWeek')
option(value='monthly')=env.t('counterPeriodMonth')

6
website/views/shared/tasks/meta_controls.jade
View file

@ -2,11 +2,11 @@
// Counter
span(ng-if='showDoubleTaskCounter(task, obj)')
span(tooltip=env.t('habitCounterUp')) +{{task.counterUp}}|
span(tooltip=env.t('habitCounterDown')) -{{task.counterDown}} 
span(tooltip='{{env.t("habitCounterUp")}} ({{env.t("resets")}} {{env.t(task.frequency)}})') +{{task.counterUp}}|
span(tooltip='{{env.t("habitCounterDown")}} ({{env.t("resets")}} {{env.t(task.frequency)}})') -{{task.counterDown}} 
span(ng-if='showSingleTaskCounter(task, obj)')
span(tooltip=env.t('habitCounter')) {{task.up ? task.counterUp : task.counterDown}} 
span(tooltip='{{env.t("habitCounter")}} ({{env.t("resets")}} {{env.t(task.frequency)}})') {{task.up ? task.counterUp : task.counterDown}} 
// Due Date
span(ng-if='task.type=="todo" && task.date')