taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user joined timeline msg

stable
Juanfran 2015-06-11 15:07:22 +02:00
parent 71aeea39f8
commit 15656e8fd1
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/locales/locale-en.json
View File

@ -1242,6 +1242,7 @@
"US_ADDED_MILESTONE": "{{username}} has added the US {{obj_name}} to {{sprint_name}}", "US_ADDED_MILESTONE": "{{username}} has added the US {{obj_name}} to {{sprint_name}}",
"US_REMOVED_FROM_MILESTONE": "{{username}} has added the US {{obj_name}} to the backlog", "US_REMOVED_FROM_MILESTONE": "{{username}} has added the US {{obj_name}} to the backlog",
"BLOCKED": "{{username}} has blocked {{obj_name}}", "BLOCKED": "{{username}} has blocked {{obj_name}}",
"UNBLOCKED": "{{username}} has unblocked {{obj_name}}" "UNBLOCKED": "{{username}} has unblocked {{obj_name}}",
"NEW_USER": "{{username}} has joined Taiga"
} }
} }

6
app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee
View File

@ -161,6 +161,12 @@ timelineType = (timeline, event) ->
return event.obj == 'task' && event.type == 'change' && timeline.data.task.userstory return event.obj == 'task' && event.type == 'change' && timeline.data.task.userstory
key: 'TIMELINE.TASK_UPDATED_WITH_US', key: 'TIMELINE.TASK_UPDATED_WITH_US',
translate_params: ['username', 'field_name', 'obj_name', 'us_name'] translate_params: ['username', 'field_name', 'obj_name', 'us_name']
},
{ # New User
check: (timeline, event) ->
return event.obj == 'user' && event.type == 'create'
key: 'TIMELINE.NEW_USER',
translate_params: ['username']
} }
] ]