From 15656e8fd1021d1f81c02474eb1a92637eee4d1c Mon Sep 17 00:00:00 2001 From: Juanfran Date: Thu, 11 Jun 2015 15:07:22 +0200 Subject: [PATCH] user joined timeline msg --- app/locales/locale-en.json | 3 ++- .../user-timeline-item-type.service.coffee | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index ad4635d6..843160ea 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -1242,6 +1242,7 @@ "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", "BLOCKED": "{{username}} has blocked {{obj_name}}", - "UNBLOCKED": "{{username}} has unblocked {{obj_name}}" + "UNBLOCKED": "{{username}} has unblocked {{obj_name}}", + "NEW_USER": "{{username}} has joined Taiga" } } diff --git a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee index 06caf41f..1b298aec 100644 --- a/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee +++ b/app/modules/user-timeline/user-timeline-item/user-timeline-item-type.service.coffee @@ -161,6 +161,12 @@ timelineType = (timeline, event) -> return event.obj == 'task' && event.type == 'change' && timeline.data.task.userstory key: 'TIMELINE.TASK_UPDATED_WITH_US', 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'] } ]