diff --git a/backend/src/services/activityService.ts b/backend/src/services/activityService.ts index 1806a0b085..35fd0d2658 100644 --- a/backend/src/services/activityService.ts +++ b/backend/src/services/activityService.ts @@ -185,7 +185,7 @@ export default class ActivityService { } else { // neither child nor parent is in a conversation, create one from parent const conversationTitle = await conversationService.generateTitle( - parent.crowdInfo.body, + parent.crowdInfo.title ? parent.crowdInfo.title : parent.crowdInfo.body, ActivityService.hasHtmlActivities(parent.platform), ) const conversationSettings = await ConversationSettingsService.findOrCreateDefault( diff --git a/frontend/src/i18n/en.js b/frontend/src/i18n/en.js index afb834e705..2f2a629b44 100644 --- a/frontend/src/i18n/en.js +++ b/frontend/src/i18n/en.js @@ -249,8 +249,8 @@ const en = { }, github: { fork: 'forked', - star: 'stared', - unstar: 'unstared', + star: 'starred', + unstar: 'unstarred', 'pull_request-open': 'opened a new pull request', 'pull_request-opened': 'opened a new pull request', 'pull_request-close': 'closed a pull request',