sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-04-14 19:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Final adjustments to PR

Browse source 
- Rename strings to make them easier to expand upon in the future
- adjust line break formatting
- remove terniary operator
This commit is contained in:
Blade Barringer 2015-08-05 18:27:08 -05:00
parent 2343e4720c
commit 787cb6cabb
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/locales/en/tasks.json
View file

@ -38,9 +38,9 @@
"streakCounter": "Streak Counter",
"repeat": "Repeat",
"repeatEvery": "Repeat Every",
"repeatEveryHelpTitle": "How often should this task be repeated?",
"repeatDailyHelpContent": "This task will be due every X days. You can set that value below.",
"repeatWeeklyHelpContent": "This task will be due on the highlighted days below. Click on a day to activate/deactivate it.",
"repeatHelpTitle": "How often should this task be repeated?",
"dailyRepeatHelpContent": "This task will be due every X days. You can set that value below.",
"weeklyRepeatHelpContent": "This task will be due on the highlighted days below. Click on a day to activate/deactivate it.",
"repeatDays": "Every X Days",
"repeatWeek": "On Certain Days of the Week",
"day": "Day",

8
website/views/shared/tasks/edit/dailies/repeat_options.jade
View file

@ -1,5 +1,6 @@
legend.option-title
span.hint(popover-trigger='mouseenter', popover-title=env.t('repeatEveryHelpTitle'), popover='{{env.t((task.frequency==="daily") ? "repeatDailyHelpContent" : "repeatWeeklyHelpContent")}}')=env.t('repeatEvery')
span.hint(popover-trigger='mouseenter', popover-title=env.t('repeatHelpTitle'),
popover='{{env.t(task.frequency + "RepeatHelpContent")}}')=env.t('repeatEvery')
// If frequency is daily
ng-form.form-group(name='everyX' ng-if='task.frequency=="daily"')
@ -13,8 +14,9 @@ ng-form.form-group(name='everyX' ng-if='task.frequency=="daily"')
// note, does not use data-toggle="buttons-checkbox" - it would interfere with our own click binding
mixin dayOfWeek(day, num)
li
button(type='button', ng-class='{active: task.repeat.#{day}}',
ng-disabled='task.challenge.id', ng-click='task.repeat.#{day} = !task.repeat.#{day}', tooltip='{{env.t((task.repeat.#{day}) ? "due" : "notDue")}}')
button(type='button', ng-class='{active: task.repeat.#{day}}',
ng-disabled='task.challenge.id', ng-click='task.repeat.#{day} = !task.repeat.#{day}',
tooltip='{{env.t((task.repeat.#{day}) ? "due" : "notDue")}}')
| {{::moment.weekdaysMin(#{num})}}
+dayOfWeek('su', 0)