From 48bbc22fb4e7fe81e6727164caa76388b245994a Mon Sep 17 00:00:00 2001 From: LlamaLad Date: Thu, 6 Jul 2017 15:31:13 -0500 Subject: [PATCH] Dailies new subheading and summary change (#8799) * Dailies new subheading and summary change * summary change --- website/client-old/js/services/taskServices.js | 3 +++ website/common/locales/en/tasks.json | 4 ++++ website/views/shared/tasks/edit/repeatables.jade | 3 +++ 3 files changed, 10 insertions(+) diff --git a/website/client-old/js/services/taskServices.js b/website/client-old/js/services/taskServices.js index 3bb2abaeb1..bdd400e5a2 100644 --- a/website/client-old/js/services/taskServices.js +++ b/website/client-old/js/services/taskServices.js @@ -357,6 +357,9 @@ angular.module('habitrpg') var numberToShortDay = Shared.DAY_MAPPING; function generateSummary(task) { + if (task._edit.everyX === 0) + return window.env.t('repeatZero'); + var frequencyPlural = frequencyMap[task._edit.frequency]; var repeatDays = ''; diff --git a/website/common/locales/en/tasks.json b/website/common/locales/en/tasks.json index 1a8543da81..e887b88f2a 100644 --- a/website/common/locales/en/tasks.json +++ b/website/common/locales/en/tasks.json @@ -147,6 +147,10 @@ "taskApprovalHasBeenRequested": "Approval has been requested", "approvals": "Approvals", "approvalRequired": "Approval Required", + "repeatZero": "Daily is never due", + "repeatType": "Repeat Type", + "repeatTypeHelpTitle": "What kind of repeat is this?", + "repeatTypeHelp": "Select \"Daily\" if you want this task to repeat every day or every third day, etc. Select \"Weekly\"if you want it to repeat on certain days of the week. If you select \"Monthly\" or \"Yearly\", adjust the Start Date to control which day of the month or year the task will be due on.", "weekly": "Weekly", "monthly": "Monthly", "yearly": "Yearly", diff --git a/website/views/shared/tasks/edit/repeatables.jade b/website/views/shared/tasks/edit/repeatables.jade index 13748ac433..94c0e3e16a 100644 --- a/website/views/shared/tasks/edit/repeatables.jade +++ b/website/views/shared/tasks/edit/repeatables.jade @@ -8,6 +8,9 @@ fieldset.option-group.advanced-option(ng-show="task.type === 'daily'") br + legend.option-title + span.hint(popover-title=env.t('repeatTypeHelpTitle'), popover=env.t("repeatTypeHelp"), popover-trigger='mouseenter') + =env.t('repeatType') select.form-control(ng-model='task._edit.frequency', ng-disabled='!canEdit(task)') option(value='daily')=env.t('daily') option(value='weekly')=env.t('weekly')