Skip to content

Commit 2111dc5

Browse files
committed
refactor: use generic status text for calendar busy events
1 parent 6b9e9c6 commit 2111dc5

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

apps/meteor/server/services/calendar/service.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import { UserStatus } from '@rocket.chat/core-typings';
55
import { cronJobs } from '@rocket.chat/cron';
66
import { Logger } from '@rocket.chat/logger';
77
import type { InsertionModel } from '@rocket.chat/model-typings';
8-
import { CalendarEvent } from '@rocket.chat/models';
8+
import { CalendarEvent, Users } from '@rocket.chat/models';
99
import type { UpdateResult, DeleteResult } from 'mongodb';
1010

1111
import { cancelUpcomingStatusChanges } from './statusEvents/cancelUpcomingStatusChanges';
1212
import { removeCronJobs } from './statusEvents/removeCronJobs';
1313
import { getShiftedTime } from './utils/getShiftedTime';
1414
import { settings } from '../../../app/settings/server';
1515
import { getUserPreference } from '../../../app/utils/server/lib/getUserPreference';
16+
import { i18n } from '../../lib/i18n';
1617

1718
const logger = new Logger('Calendar');
1819

@@ -260,9 +261,12 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
260261
return;
261262
}
262263

264+
const user = await Users.findOneById<Pick<IUser, '_id' | 'language'>>(event.uid, { projection: { language: 1 } });
265+
const lng = user?.language || settings.get<string>('Language') || 'en';
266+
263267
await Presence.setActiveState(event.uid, {
264268
statusDefault: UserStatus.BUSY,
265-
statusText: event.subject,
269+
statusText: i18n.t('Presence_status_in_a_meeting', { lng }),
266270
statusSource: 'external',
267271
statusExpiresAt: event.endTime,
268272
});

0 commit comments

Comments
 (0)