krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added translation functions to task types

Browse Source
This commit is contained in:
Keith Holliday
2015-11-30 09:26:07 -06:00
parent ea87784575
commit 4663c7cf5e
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/locales/en/tasks.json
View File

@@ -5,6 +5,7 @@
"beeminderDeleteWarning": "Beeminder users: <strong>First</strong> read <a href=\"http://habitica.wikia.com/wiki/Beeminder#Deleting_Completed_To-Dos_Without_Confusing_Beeminder\">Deleting Completed To-Dos Without Confusing Beeminder</a>!", "beeminderDeleteWarning": "Beeminder users: <strong>First</strong> read <a href=\"http://habitica.wikia.com/wiki/Beeminder#Deleting_Completed_To-Dos_Without_Confusing_Beeminder\">Deleting Completed To-Dos Without Confusing Beeminder</a>!",
"addmultiple": "Add Multiple", "addmultiple": "Add Multiple",
"addsingle": "Add Single", "addsingle": "Add Single",
"habit": "Habit",
"habits": "Habits", "habits": "Habits",
"newHabit": "New Habit", "newHabit": "New Habit",
"newHabitBulk": "New Habits (one per line)", "newHabitBulk": "New Habits (one per line)",
@@ -32,6 +33,7 @@
"mental": "Mental", "mental": "Mental",
"otherExamples": "Eg, professional pursuits, hobbies, financial, etc.", "otherExamples": "Eg, professional pursuits, hobbies, financial, etc.",
"progress": "Progress", "progress": "Progress",
"daily": "Daily",
"dailies": "Dailies", "dailies": "Dailies",
"newDaily": "New Daily", "newDaily": "New Daily",
"newDailyBulk": "New Dailies (one per line)", "newDailyBulk": "New Dailies (one per line)",
@@ -46,6 +48,7 @@
"day": "Day", "day": "Day",
"days": "Days", "days": "Days",
"restoreStreak": "Restore Streak", "restoreStreak": "Restore Streak",
"todo": "To-Do",
"todos": "To-Dos", "todos": "To-Dos",
"newTodo": "New To-Do", "newTodo": "New To-Do",
"newTodoBulk": "New To-Dos (one per line)", "newTodoBulk": "New To-Dos (one per line)",
@@ -57,6 +60,7 @@
"notDue": "Not Due", "notDue": "Not Due",
"grey": "Grey", "grey": "Grey",
"score": "Score", "score": "Score",
"reward": "Reward",
"rewards": "Rewards", "rewards": "Rewards",
"ingamerewards": "Equipment & Skills", "ingamerewards": "Equipment & Skills",
"gold": "Gold", "gold": "Gold",

2
website/public/js/controllers/challengesCtrl.js
View File

@@ -212,7 +212,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
}; };
$scope.removeTask = function(task, list) { $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 //TODO persist
// User.log({op: "delTask", data: task}); // User.log({op: "delTask", data: task});
_.remove(list, task); _.remove(list, task);

2
website/public/js/controllers/tasksCtrl.js
View File

@@ -92,7 +92,7 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
}; };
$scope.removeTask = function(task) { $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}}) User.user.ops.deleteTask({params:{id:task.id}})
}; };