Merge branch 'bugfix/github-check-repo-available' of github.com:CrowdDotDev/crowd.dev into bugfix/github-check-repo-available

epipav · epipav · commit 2c51c6ccb462 · 2022-09-07T12:32:11.000+03:00
diff --git 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
@@ -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',

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ export default class ActivityService {`
`185`	`185`	`} else {`
`186`	`186`	`// neither child nor parent is in a conversation, create one from parent`
`187`	`187`	`const conversationTitle = await conversationService.generateTitle(`
`188`		`- parent.crowdInfo.body,`
	`188`	`+ parent.crowdInfo.title ? parent.crowdInfo.title : parent.crowdInfo.body,`
`189`	`189`	`ActivityService.hasHtmlActivities(parent.platform),`
`190`	`190`	`)`
`191`	`191`	`const conversationSettings = await ConversationSettingsService.findOrCreateDefault(`