krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change attribute names and popups

Browse Source 
Closes #2044
Closes #7606
This commit is contained in:
MathWhiz
2016-06-04 22:04:15 -04:00
committed by Blade Barringer
parent 1915f8665c
commit 0e5f748c9a
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,9 +28,6 @@
"medium": "Medium", "medium": "Medium",
"hard": "Hard", "hard": "Hard",
"attributes": "Attributes", "attributes": "Attributes",
"physical": "Physical",
"mental": "Mental",
"otherExamples": "Eg, professional pursuits, hobbies, financial, etc.",
"progress": "Progress", "progress": "Progress",
"daily": "Daily", "daily": "Daily",
"dailies": "Dailies", "dailies": "Dailies",
@@ -127,5 +124,9 @@
"positionRequired": "\"position\" is required and must be a number.", "positionRequired": "\"position\" is required and must be a number.",
"cantMoveCompletedTodo": "Can't move a completed todo.", "cantMoveCompletedTodo": "Can't move a completed todo.",
"directionUpDown": "\"direction\" is required and must be 'up' or 'down'.", "directionUpDown": "\"direction\" is required and must be 'up' or 'down'.",
"alreadyTagged": "The task is already tagged with given tag." "alreadyTagged": "The task is already tagged with given tag.",
"strengthExample": "Relating to exercise and activity",
"intelligenceExample": "Relating to academic or mentally challenging pursuits",
"perceptionExample": "Relating to work or financial tasks",
"constitutionExample": "Relating to health, wellness, and social interaction"
} }

19
website/views/shared/tasks/edit/advanced_options.jade
View File

@@ -58,18 +58,21 @@ div(ng-if='::task.type!="reward"')
ul.task-attributes ul.task-attributes
li li
button(type='button', ng-class='{active: task.attribute=="str"}', button(type='button', ng-class='{active: task.attribute=="str"}',
ng-click='task.attribute="str"') ng-click='task.attribute="str"',
=env.t('physical') popover=env.t('strengthExample'), popover-trigger='mouseenter', popover-placement='top')
=env.t('strength')
li li
button(type='button', ng-class='{active: task.attribute=="int"}', button(type='button', ng-class='{active: task.attribute=="int"}',
ng-click='task.attribute="int"') ng-click='task.attribute="int"',
=env.t('mental') popover=env.t('intelligenceExample'), popover-trigger='mouseenter', popover-placement='top')
=env.t('intelligence')
li li
button(type='button', ng-class='{active: task.attribute=="con"}', button(type='button', ng-class='{active: task.attribute=="con"}',
ng-click='task.attribute="con"') ng-click='task.attribute="con"',
=env.t('social') popover=env.t('constitutionExample'), popover-trigger='mouseenter', popover-placement='top')
=env.t('constitution')
li li
button(type='button', ng-class='{active: task.attribute=="per"}', button(type='button', ng-class='{active: task.attribute=="per"}',
ng-click='task.attribute="per"', ng-click='task.attribute="per"',
popover=env.t('otherExamples'), popover-trigger='mouseenter', popover-placement='top') popover=env.t('perceptionExamples'), popover-trigger='mouseenter', popover-placement='top')
=env.t('other') =env.t('perception')