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

Continuation of PR #8675, fix internationalization (#8698)

Browse source 
* Made uneditable habits show counter reset frequency
Added counter reset frequency to counter tooltip
Solves issue https://github.com/HabitRPG/habitica/issues/8571

* Internationalization fix, pursuant to https://github.com/HabitRPG/habitica/pull/8675#discussion_r112982947
This commit is contained in:
yugensoft 2017-05-09 21:22:09 +03:00 committed by Sabe Jones
parent 15d4f7d6ab
commit 2adac35e31
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,9 +140,9 @@
"counterPeriodDay": "Day",
"counterPeriodWeek": "Week",
"counterPeriodMonth": "Month",
"habitCounter": "Counter",
"habitCounterUp": "Positive Counter",
"habitCounterDown": "Negative Counter",
"habitCounter": "Counter (Resets <%= frequency %>)",
"habitCounterUp": "Positive Counter (Resets <%= frequency %>)",
"habitCounterDown": "Negative Counter (Resets <%= frequency %>)",
"taskRequiresApproval": "This task must be approved before you can complete it. Approval has already been requested",
"taskApprovalHasBeenRequested": "Approval has been requested",
"approvals": "Approvals",

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")}} ({{env.t("resets")}} {{env.t(task.frequency)}})') +{{task.counterUp}}|
span(tooltip='{{env.t("habitCounterDown")}} ({{env.t("resets")}} {{env.t(task.frequency)}})') -{{task.counterDown}}&nbsp;
span(tooltip='{{env.t( "habitCounterUp", {frequency:env.t(task.frequency)} )}}') +{{task.counterUp}}|
span(tooltip='{{env.t( "habitCounterDown", {frequency:env.t(task.frequency)} )}}') -{{task.counterDown}}&nbsp;
span(ng-if='showSingleTaskCounter(task, obj)')
span(tooltip='{{env.t("habitCounter")}} ({{env.t("resets")}} {{env.t(task.frequency)}})') {{task.up ? task.counterUp : task.counterDown}}&nbsp;
span(tooltip='{{env.t( "habitCounter", {frequency:env.t(task.frequency)} )}}') {{task.up ? task.counterUp : task.counterDown}}&nbsp;
// Due Date
span(ng-if='task.type=="todo" && task.date')