diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json index 50e92d2cd7..a6206de052 100644 --- a/common/locales/en/tasks.json +++ b/common/locales/en/tasks.json @@ -5,6 +5,7 @@ "beeminderDeleteWarning": "Beeminder users: First read Deleting Completed To-Dos Without Confusing Beeminder!", "addmultiple": "Add Multiple", "addsingle": "Add Single", + "habit": "Habit", "habits": "Habits", "newHabit": "New Habit", "newHabitBulk": "New Habits (one per line)", @@ -32,6 +33,7 @@ "mental": "Mental", "otherExamples": "Eg, professional pursuits, hobbies, financial, etc.", "progress": "Progress", + "daily": "Daily", "dailies": "Dailies", "newDaily": "New Daily", "newDailyBulk": "New Dailies (one per line)", @@ -46,6 +48,7 @@ "day": "Day", "days": "Days", "restoreStreak": "Restore Streak", + "todo": "To-Do", "todos": "To-Dos", "newTodo": "New To-Do", "newTodoBulk": "New To-Dos (one per line)", @@ -57,6 +60,7 @@ "notDue": "Not Due", "grey": "Grey", "score": "Score", + "reward": "Reward", "rewards": "Rewards", "ingamerewards": "Equipment & Skills", "gold": "Gold", diff --git a/website/public/js/controllers/challengesCtrl.js b/website/public/js/controllers/challengesCtrl.js index 5840d2fbee..9152857195 100644 --- a/website/public/js/controllers/challengesCtrl.js +++ b/website/public/js/controllers/challengesCtrl.js @@ -212,7 +212,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User', }; $scope.removeTask = function(task, list) { - if (!confirm(window.env.t('sureDelete', {taskType: task.type, taskText: task.text}))) return; + if (!confirm(window.env.t('sureDelete', {taskType: window.env.t(task.type), taskText: task.text}))) return; //TODO persist // User.log({op: "delTask", data: task}); _.remove(list, task); diff --git a/website/public/js/controllers/tasksCtrl.js b/website/public/js/controllers/tasksCtrl.js index d0e82acd1d..de56322bbb 100644 --- a/website/public/js/controllers/tasksCtrl.js +++ b/website/public/js/controllers/tasksCtrl.js @@ -92,7 +92,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N }; $scope.removeTask = function(task) { - if (!confirm(window.env.t('sureDelete', {taskType: task.type, taskText: task.text}))) return; + if (!confirm(window.env.t('sureDelete', {taskType: window.env.t(task.type), taskText: task.text}))) return; User.user.ops.deleteTask({params:{id:task.id}}) };