From 2adac35e31e379f43d1b8b189510ad995d920be4 Mon Sep 17 00:00:00 2001
From: yugensoft <contact@yugensoft.com>
Date: Tue, 9 May 2017 21:22:09 +0300
Subject: [PATCH] Continuation of PR #8675, fix internationalization (#8698)

* 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
---
 website/common/locales/en/tasks.json          | 6 +++---
 website/views/shared/tasks/meta_controls.jade | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/website/common/locales/en/tasks.json b/website/common/locales/en/tasks.json
index 4ef96e1e89..633dc06033 100644
--- a/website/common/locales/en/tasks.json
+++ b/website/common/locales/en/tasks.json
@@ -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",
diff --git a/website/views/shared/tasks/meta_controls.jade b/website/views/shared/tasks/meta_controls.jade
index f824a23b03..e8a6de18f8 100644
--- a/website/views/shared/tasks/meta_controls.jade
+++ b/website/views/shared/tasks/meta_controls.jade
@@ -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')