diff --git a/.changeset/yellow-cars-change.md b/.changeset/yellow-cars-change.md new file mode 100644 index 0000000000000..17b07d9adc6f9 --- /dev/null +++ b/.changeset/yellow-cars-change.md @@ -0,0 +1,8 @@ +--- +'@rocket.chat/fuselage-ui-kit': patch +'@rocket.chat/ui-video-conf': patch +'@rocket.chat/i18n': patch +'@rocket.chat/meteor': patch +--- + +Fixes an issue where video conf message block wasn't considering display avatars preference diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx index 4d5c217dbf78f..9f3e04fd4de0b 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx @@ -106,7 +106,7 @@ const VideoConfListItem = ({ {joinedUsers.length > VIDEOCONF_STACK_MAX_USERS - ? t('__usersCount__member_joined', { count: joinedUsers.length - VIDEOCONF_STACK_MAX_USERS }) + ? t('__usersCount__joined', { count: joinedUsers.length - VIDEOCONF_STACK_MAX_USERS }) : t('joined')} diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts index e43d82d19dad1..231e4ba806b30 100644 --- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts +++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts @@ -369,6 +369,10 @@ export class HomeContent { return this.page.locator('.rcx-videoconf-message-block'); } + get videoConfMessageBlockAvatars(): Locator { + return this.videoConfMessageBlock.getByLabel('figure'); + } + get btnAnonymousSignIn(): Locator { return this.page.locator('footer >> role=button[name="Sign in to start talking"]'); } diff --git a/apps/meteor/tests/e2e/utils/index.ts b/apps/meteor/tests/e2e/utils/index.ts index e1daf601f648c..7548171e8758d 100644 --- a/apps/meteor/tests/e2e/utils/index.ts +++ b/apps/meteor/tests/e2e/utils/index.ts @@ -1,3 +1,4 @@ export * from './create-target-channel'; export * from './setSettingValueById'; export * from './getSettingValueById'; +export * from './setUserPreferences'; diff --git a/apps/meteor/tests/e2e/video-conference.spec.ts b/apps/meteor/tests/e2e/video-conference.spec.ts index 36f10fddbff44..63ebdd2966dc0 100644 --- a/apps/meteor/tests/e2e/video-conference.spec.ts +++ b/apps/meteor/tests/e2e/video-conference.spec.ts @@ -1,7 +1,7 @@ import { IS_EE } from './config/constants'; import { Users } from './fixtures/userStates'; import { HomeChannel } from './page-objects'; -import { createTargetChannel, createTargetTeam, createDirectMessage } from './utils'; +import { createTargetChannel, setUserPreferences, createTargetTeam, createDirectMessage } from './utils'; import { expect, test } from './utils/test'; test.use({ storageState: Users.user1.state }); @@ -35,6 +35,24 @@ test.describe('video conference', () => { await expect(poHomeChannel.content.videoConfMessageBlock.last()).toBeVisible(); }); + test.describe('test video conference message block', async () => { + test.use({ storageState: Users.admin.state }); + + test.beforeAll(async ({ api }) => { + await setUserPreferences(api, { displayAvatars: false }); + }); + + test.afterAll(async ({ api }) => { + await setUserPreferences(api, { displayAvatars: true }); + }); + + test('should not render avatars in video conference message block', async () => { + await poHomeChannel.sidenav.openChat(targetChannel); + + await expect(poHomeChannel.content.videoConfMessageBlock.last().getByRole('figure')).toHaveCount(0); + }); + }); + test.describe('test received in a "target channel"', async () => { test.use({ storageState: Users.user2.state }); test('verify if user received a invite call from "targetChannel"', async () => { diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx index 64401e43b82c6..cb1d861dc3322 100644 --- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx +++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx @@ -1,8 +1,10 @@ import { VideoConferenceStatus } from '@rocket.chat/core-typings'; import { useGoToRoom, + useSetting, useTranslation, useUserId, + useUserPreference, } from '@rocket.chat/ui-contexts'; import type * as UiKit from '@rocket.chat/ui-kit'; import { @@ -20,7 +22,7 @@ import { VideoConfMessageAction, } from '@rocket.chat/ui-video-conf'; import type { MouseEventHandler, ReactElement } from 'react'; -import { useContext, memo } from 'react'; +import { useContext, memo, useMemo } from 'react'; import { UiKitContext } from '../..'; import { useVideoConfDataStream } from './hooks/useVideoConfDataStream'; @@ -39,6 +41,8 @@ const VideoConferenceBlock = ({ const surfaceType = useSurfaceType(); const userId = useUserId(); const goToRoom = useGoToRoom(); + const displayAvatars = useUserPreference('displayAvatars'); + const showRealName = useSetting('UI_Use_Real_Name'); const { action, viewId = undefined, rid } = useContext(UiKitContext); @@ -97,6 +101,22 @@ const VideoConferenceBlock = ({ } }; + const messageFooterText = useMemo(() => { + const usersCount = result.data?.users.length; + + if (!displayAvatars) { + return t('__usersCount__joined', { + count: usersCount, + }); + } + + return usersCount && usersCount > MAX_USERS + ? t('plus__usersCount__joined', { + count: usersCount - MAX_USERS, + }) + : t('joined'); + }, [displayAvatars, t, result.data?.users.length]); + if (result.isPending || result.isError) { // TODO: error handling return ; @@ -105,6 +125,19 @@ const VideoConferenceBlock = ({ const { data } = result; const isUserCaller = data.createdBy._id === userId; + const joinedNamesOrUsernames = [...data.users] + .splice(0, MAX_USERS) + .map(({ name, username }) => (showRealName ? name || username : username)) + .join(', '); + + const title = + data.users.length > MAX_USERS + ? t('__usernames__and__count__more_joined', { + usernames: joinedNamesOrUsernames, + count: data.users.length - MAX_USERS, + }) + : t('__usernames__joined', { usernames: joinedNamesOrUsernames }); + const actions = ( {data.discussionRid && ( @@ -148,12 +181,8 @@ const VideoConferenceBlock = ({ (data.users.length ? ( <> - - {data.users.length > MAX_USERS - ? t('__usersCount__member_joined', { - usersCount: data.users.length - MAX_USERS, - }) - : t('joined')} + + {messageFooterText} ) : ( @@ -206,12 +235,8 @@ const VideoConferenceBlock = ({ {Boolean(data.users.length) && ( <> - - {data.users.length > MAX_USERS - ? t('__usersCount__member_joined', { - count: data.users.length - MAX_USERS, - }) - : t('joined')} + + {messageFooterText} )} diff --git a/packages/i18n/src/locales/af.i18n.json b/packages/i18n/src/locales/af.i18n.json index 351b0e905beb5..3db46a1316986 100644 --- a/packages/i18n/src/locales/af.i18n.json +++ b/packages/i18n/src/locales/af.i18n.json @@ -1408,7 +1408,6 @@ "Join_video_call": "Sluit aan by 'n video-oproep", "join-without-join-code": "Sluit aan by geen Kode", "join-without-join-code_description": "Toestemming om die aansluit kode in kanale te omseil met die bykomende kode geaktiveer", - "Joined": "Aangesluit", "Jump": "Spring", "Jump_to_first_unread": "Spring na eerste ongelees", "Jump_to_message": "Spring na boodskap", diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json index 649005b9e0b7b..86858e90855ad 100644 --- a/packages/i18n/src/locales/ar.i18n.json +++ b/packages/i18n/src/locales/ar.i18n.json @@ -2330,7 +2330,6 @@ "Join_my_room_to_start_the_video_call": "انضمام إلى غرفتي لبدء مكالمة الفيديو", "join-without-join-code": "الانضمام من دون رمز الانضمام", "join-without-join-code_description": "إذن لتجاوز رمز الانضمام في القنوات مع تمكين رمز الانضمام", - "Joined": "تم الانضمام", "Joined_at": "تم الانضمام في", "Jump": "الانتقال السريع", "Jump_to_first_unread": "الذهاب السريع إلى أول رسالة غير مقروءة", @@ -4874,4 +4873,4 @@ "Enterprise": "مؤسسة", "UpgradeToGetMore_engagement-dashboard_Title": "التحليلات", "UpgradeToGetMore_auditing_Title": "تدقيق الرسائل" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/az.i18n.json b/packages/i18n/src/locales/az.i18n.json index 72ba790e854df..5fbc0d7420eac 100644 --- a/packages/i18n/src/locales/az.i18n.json +++ b/packages/i18n/src/locales/az.i18n.json @@ -1408,7 +1408,6 @@ "Join_video_call": "Video zənginə qoşulun", "join-without-join-code": "Qoşulma Kodunu Olmadan Qeyd Olun", "join-without-join-code_description": "Birləşmə kodunu aktivləşdirən kanallarda qoşulma kodunu atmaq üçün icazə", - "Joined": "Qoşulmuşdur", "Jump": "Tullanmaq", "Jump_to_first_unread": "İlk okunmamışa keç", "Jump_to_message": "Mesaja atlayın", diff --git a/packages/i18n/src/locales/be-BY.i18n.json b/packages/i18n/src/locales/be-BY.i18n.json index 44e1913e7ef7e..4185d6080b6cd 100644 --- a/packages/i18n/src/locales/be-BY.i18n.json +++ b/packages/i18n/src/locales/be-BY.i18n.json @@ -1424,7 +1424,6 @@ "Join_video_call": "рэгістрацыя гутарку", "join-without-join-code": "Рэгістрацыя без рэгістрацыі коды", "join-without-join-code_description": "Дазвол на абыход далучыцца код у каналах з падтрымкай далучыцца код", - "Joined": "рэгістрацыя", "Jump": "перайсці", "Jump_to_first_unread": "Перайсці да першага непрачытанага", "Jump_to_message": "Перайсці да паведамлення", diff --git a/packages/i18n/src/locales/bg.i18n.json b/packages/i18n/src/locales/bg.i18n.json index a5bb5d70f4826..7370664b3c394 100644 --- a/packages/i18n/src/locales/bg.i18n.json +++ b/packages/i18n/src/locales/bg.i18n.json @@ -1406,7 +1406,6 @@ "Join_video_call": "Включете видеообаждането", "join-without-join-code": "Присъединете се без кода за присъединяване", "join-without-join-code_description": "Разрешено е да заобиколите кода за присъединяване в канали с включен код за включване", - "Joined": "Присъединиха", "Jump": "Направо", "Jump_to_first_unread": "Премини към първите непрочетени", "Jump_to_message": "Отидете на съобщението", diff --git a/packages/i18n/src/locales/bs.i18n.json b/packages/i18n/src/locales/bs.i18n.json index 1c3cc2fe872c2..c6c9813a752d7 100644 --- a/packages/i18n/src/locales/bs.i18n.json +++ b/packages/i18n/src/locales/bs.i18n.json @@ -1404,7 +1404,6 @@ "Join_video_call": "Pridružite se videopozivu", "join-without-join-code": "Pridružite se bez pridruživanja kodu", "join-without-join-code_description": "Dozvola za zaobilaženje pridruženog koda u kanalima s omogućenim pridruženim kodom", - "Joined": "Član od", "Jump": "Skok", "Jump_to_first_unread": "Skoči na prvu nepročitanu", "Jump_to_message": "Skoči na poruku", diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json index 59f94a4baee5f..1e4ae4e16c950 100644 --- a/packages/i18n/src/locales/ca.i18n.json +++ b/packages/i18n/src/locales/ca.i18n.json @@ -2298,7 +2298,6 @@ "Join_my_room_to_start_the_video_call": "Uneix-te a la meva sala per iniciar la videotrucada", "join-without-join-code": "Unir-se sense el codi", "join-without-join-code_description": "Permís per unir-se a canals amb codi d'unió actiu sense tenir-lo", - "Joined": "Unit", "Joined_at": "Inscrit a", "Jump": "Saltar", "Jump_to_first_unread": "Anar al primer no llegit", @@ -4676,4 +4675,4 @@ "Enterprise": "Empresa", "UpgradeToGetMore_engagement-dashboard_Title": "Analítiques", "UpgradeToGetMore_auditing_Title": "Auditoria de missatges" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json index ea6ccaf9bd463..73d89df40b53b 100644 --- a/packages/i18n/src/locales/cs.i18n.json +++ b/packages/i18n/src/locales/cs.i18n.json @@ -1987,7 +1987,6 @@ "Join_video_call": "Připojit k videohovoru", "join-without-join-code": "Připojit se i do místností bez kódu", "join-without-join-code_description": "Právo přeskočit připojit bez zadávání kódu do místností, které jej vyžadují", - "Joined": "Připojil", "Joined_at": "Připojen/a", "Jump": "Přejít", "Jump_to_first_unread": "Přejít na první nepřečtenou", @@ -3962,4 +3961,4 @@ "Enterprise": "Korporace", "UpgradeToGetMore_engagement-dashboard_Title": "Analytika", "UpgradeToGetMore_auditing_Title": "Audit zpráv" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/cy.i18n.json b/packages/i18n/src/locales/cy.i18n.json index 814ba6e93a60c..dee7d8273247a 100644 --- a/packages/i18n/src/locales/cy.i18n.json +++ b/packages/i18n/src/locales/cy.i18n.json @@ -1404,7 +1404,6 @@ "Join_video_call": "Ymunwch â ffōn fideo", "join-without-join-code": "Ymunwch Heb Ymuno â Chod", "join-without-join-code_description": "Caniatâd i osgoi'r cod ymuno mewn sianelau a chodir cod ymuno", - "Joined": "Ymunodd", "Jump": "Neidio", "Jump_to_first_unread": "Neidio i ddarllen heb ei ddarllen gyntaf", "Jump_to_message": "Neidio i neges", diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json index 97fcafdf1fb7b..718295d4bf23f 100644 --- a/packages/i18n/src/locales/da.i18n.json +++ b/packages/i18n/src/locales/da.i18n.json @@ -2076,7 +2076,6 @@ "Join_video_call": "Deltag i videoopkald", "join-without-join-code": "Join uden join-kode", "join-without-join-code_description": "Tilladelse til at omgå join-kode i kanaler med join-kode aktiveret", - "Joined": "Tilsluttede", "Joined_at": "Tilsluttet ved ", "Jump": "Gå", "Jump_to_first_unread": "Gå til første ulæste", @@ -4074,4 +4073,4 @@ "Enterprise": "Firma", "UpgradeToGetMore_engagement-dashboard_Title": "Analyse", "UpgradeToGetMore_auditing_Title": "Meddelelsesovervågning" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/de-AT.i18n.json b/packages/i18n/src/locales/de-AT.i18n.json index 760f180929360..00717193c8f33 100644 --- a/packages/i18n/src/locales/de-AT.i18n.json +++ b/packages/i18n/src/locales/de-AT.i18n.json @@ -1410,7 +1410,6 @@ "Join_video_call": "Videoanruf beitreten", "join-without-join-code": "Join ohne Join-Code", "join-without-join-code_description": "Berechtigung zum Umgehen des Join-Codes in Kanälen mit aktiviertem Join-Code", - "Joined": "Beigetreten", "Jump": "Springen", "Jump_to_first_unread": "Erste ungelesene Nachricht anzeigen", "Jump_to_message": "Diese Nachricht im Chat anzeigen", diff --git a/packages/i18n/src/locales/de-IN.i18n.json b/packages/i18n/src/locales/de-IN.i18n.json index 7cbcafd953d3e..93bacebaf2cf0 100644 --- a/packages/i18n/src/locales/de-IN.i18n.json +++ b/packages/i18n/src/locales/de-IN.i18n.json @@ -1605,7 +1605,6 @@ "Join_video_call": "Videoanruf beitreten", "join-without-join-code": "Ohne Code beitreten", "join-without-join-code_description": "Berechtigung, Kanäle mit Zutrittscode auch ohne Code zu betreten", - "Joined": "Beigetreten", "Jump": "Springen", "Jump_to_first_unread": "Erste ungelesene Nachricht anzeigen", "Jump_to_message": "Diese Nachricht im Chat anzeigen", @@ -3072,4 +3071,4 @@ "Your_question": "Deine Frage", "Your_server_link": "Dein Server-Link", "Your_workspace_is_ready": "Dein Arbeitsbereich ist einsatzbereit 🎉" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json index 7f080afb779e3..38c56d02861c1 100644 --- a/packages/i18n/src/locales/de.i18n.json +++ b/packages/i18n/src/locales/de.i18n.json @@ -4,8 +4,6 @@ "__count__empty_rooms_will_be_removed_automatically__rooms__": "{{count}} leere Räume werden automatisch entfernt:
{{rooms}}.", "__count__message_pruned_one": "{{count}} Nachricht gelöscht", "__count__message_pruned_other": "{{count}} Nachrichten gelöscht", - "__usersCount__member_joined_one": "+ {{count}} Mitglied(er) beigetreten", - "__usersCount__member_joined_other": "+ {{count}} Mitglieder beigetreten", "__usersCount__people_will_be_invited": "{{usersCount}} Mitglieder werden eingeladen", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} ist nicht länger {{role}}, geändert durch {{user_by}}", "__username__was_set__role__by__user_by_": "{{username}} ist jetzt {{role}}, geändert durch {{user_by}}", @@ -2587,7 +2585,6 @@ "Join_my_room_to_start_the_video_call": "Meinen Raum betreten, um den Videoanruf zu starten", "join-without-join-code": "Ohne Code beitreten", "join-without-join-code_description": "Berechtigung, Channels mit Zutrittscode auch ohne Code zu betreten", - "Joined": "Beigetreten", "joined": "beigetreten", "Joined_at": "Beigetreten am", "JSON": "JSON", diff --git a/packages/i18n/src/locales/el.i18n.json b/packages/i18n/src/locales/el.i18n.json index 2092c40ad9030..caf851c5f7d3b 100644 --- a/packages/i18n/src/locales/el.i18n.json +++ b/packages/i18n/src/locales/el.i18n.json @@ -1415,7 +1415,6 @@ "Join_video_call": "Συμμετοχή στην κλήση βίντεο", "join-without-join-code": "Συμμετοχή χωρίς κωδικό σύνδεσης", "join-without-join-code_description": "Επιτρέπεται η παράκαμψη του κωδικού σύνδεσης σε κανάλια με ενεργοποιημένο τον κωδικό πρόσβασης", - "Joined": "Εντάχθηκαν", "Jump": "Άλμα", "Jump_to_first_unread": "Μετάβαση σε πρώτη αδιάβαστη", "Jump_to_message": "Μετάβαση σε μήνυμα", diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json index cd2d9d29b9453..f8b6a9af0677f 100644 --- a/packages/i18n/src/locales/en.i18n.json +++ b/packages/i18n/src/locales/en.i18n.json @@ -12,8 +12,10 @@ "__count__follower_other": "+{{count}} followers", "__count__tags__and__count__conversations__period__": "{{count}} tags and {{conversations}} conversations, {{period}}", "__departments__departments_and__count__conversations__period__": "{{departments}} departments and {{count}} conversations, {{period}}", - "__usersCount__member_joined_one": "+ {{count}} member joined", - "__usersCount__member_joined_other": "+ {{count}} members joined", + "__usersCount__joined": "{{count}} joined", + "plus__usersCount__joined": "+ {{count}} joined", + "__usernames__joined": "{{usernames}} joined", + "__usernames__and__count__more_joined": "{{usernames}} and {{count}} more joined", "__usersCount__people_will_be_invited": "{{usersCount}} people will be invited", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} is no longer {{role}} by {{user_by}}", "__username__was_set__role__by__user_by_": "{{username}} was set {{role}} by {{user_by}}", @@ -2985,7 +2987,6 @@ "Join_my_room_to_start_the_video_call": "Join my room to start the video call", "join-without-join-code": "Join Without Join Code", "join-without-join-code_description": "Permission to bypass the join code in channels with join code enabled", - "Joined": "Joined", "joined": "joined", "Joined_at": "Joined at", "JSON": "JSON", diff --git a/packages/i18n/src/locales/eo.i18n.json b/packages/i18n/src/locales/eo.i18n.json index 7186babce95b0..5e007b1b5d372 100644 --- a/packages/i18n/src/locales/eo.i18n.json +++ b/packages/i18n/src/locales/eo.i18n.json @@ -1408,7 +1408,6 @@ "Join_video_call": "Aliĝi al videolvoko", "join-without-join-code": "Aliĝu Sen Aliĝilo", "join-without-join-code_description": "Permeso por preterlasi la unuigitan kodon en kanaloj kun unuiga kodo ebligita", - "Joined": "Kunvenita", "Jump": "Saltu", "Jump_to_first_unread": "Saltu al unua nelegebla", "Jump_to_message": "Saltu mesaĝon", diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json index 143eb8d55c2d0..fee173326f545 100644 --- a/packages/i18n/src/locales/es.i18n.json +++ b/packages/i18n/src/locales/es.i18n.json @@ -9,15 +9,12 @@ "__count__conversations__period__": "{{count}} conversaciones, {{period}}", "__count__tags__and__count__conversations__period__": "{{count}} etiquetas y {{conversations}} conversaciones, {{period}}", "__departments__departments_and__count__conversations__period__": "{{departments}} departamentos y {{count}} conversaciones, {{period}}", - "__usersCount__member_joined_one": "{{count}} miembro se ha unido", - "__usersCount__member_joined_other": "{{count}} miembros se han unido", "__usersCount__people_will_be_invited": "{{usersCount}} miembros sern invitados", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} ya no es {{role}} (por {{user_by}})", "__username__was_set__role__by__user_by_": "{{username}} se ha establecido como {{role}} por {{user_by}}", "__count__without__department__": "{{count}} sin departamentos", "__count__without__tags__": "{{count}} sin etiquetas", "__count__without__assignee__": "{{count}} sin un agente asignado", - "__usersCount__member_joined_many": "{{count}} miembros se han unido", "removed__username__as__role_": "se removió {{username}} como {{role}}", "set__username__as__role_": " se estableció a {{username}} como {{role}}", "This_room_encryption_has_been_enabled_by__username_": "El cifrado de esta sala ha sido habilitado por {{username}}", @@ -2324,7 +2321,6 @@ "Join_my_room_to_start_the_video_call": "Únete a mi sala para iniciar la videollamada", "join-without-join-code": "Unirse sin el código de participación", "join-without-join-code_description": "Permiso para eludir el código de participación en canales en los que este código está habilitado", - "Joined": "Unido", "Joined_at": "Se unió a las", "Jump": "Ir", "Jump_to_first_unread": "Ir a lo primero no leído", @@ -5070,4 +5066,4 @@ "Unlimited_seats": "Puestos ilimitados", "Unlimited_MACs": "Contactos Activos por Mes (MAC) ilimitados", "Unlimited_seats_MACs": "Puestos y Contactos Activos por Mes (MAC) ilimitados" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/fa.i18n.json b/packages/i18n/src/locales/fa.i18n.json index 6ee68b8438f8b..7557e4b7213f3 100644 --- a/packages/i18n/src/locales/fa.i18n.json +++ b/packages/i18n/src/locales/fa.i18n.json @@ -1672,7 +1672,6 @@ "Join_video_call": "پیوستن به تماس ویدیویی", "join-without-join-code": "بدون تاریخ عضویت", "join-without-join-code_description": "اجازه استفاده از کد پیوست در کانالها با استفاده از کد پیوست فعال شده است", - "Joined": "پیوسته", "Jump": "پرش", "Jump_to_first_unread": "پرش به اولین خوانده نشده", "Jump_to_message": "پرش به پیام", diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json index 8e3749f5f8959..ba94975681785 100644 --- a/packages/i18n/src/locales/fi.i18n.json +++ b/packages/i18n/src/locales/fi.i18n.json @@ -4,8 +4,6 @@ "__count__empty_rooms_will_be_removed_automatically__rooms__": "{{count}} tyhjää huonetta poistetaan automaattisesti:
{{rooms}}.", "__count__message_pruned_one": "{{count}} viesti karsittu", "__count__message_pruned_other": "{{count}} viestiä karsittu", - "__usersCount__member_joined_one": "+ {{count}} jäsen liittyi", - "__usersCount__member_joined_other": "+ {{count}} jäsentä liittynyt", "__usersCount__people_will_be_invited": "{{usersCount}} henkilöä kutsutaan", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} ei ole enää {{role}} (muutoksen teki {{user_by}})", "__username__was_set__role__by__user_by_": "{{user_by}} muutti käyttäjän {{username}} rooliksi {{role}} ", @@ -2621,7 +2619,6 @@ "Join_my_room_to_start_the_video_call": "Aloita videopuhelu liittymällä huoneeseeni", "join-without-join-code": "Liity ilman liittymiskoodia", "join-without-join-code_description": "Oikeus ohittaa liittymiskoodi kanavilla, joilla liittymiskoodi on käytössä", - "Joined": "Liittynyt", "joined": "liittyi", "Joined_at": "Liittyi klo", "JSON": "JSON", diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json index bd9043b59a97f..c9c387a35287d 100644 --- a/packages/i18n/src/locales/fr.i18n.json +++ b/packages/i18n/src/locales/fr.i18n.json @@ -2318,7 +2318,6 @@ "Join_my_room_to_start_the_video_call": "Rejoindre mon salon pour démarrer l'appel vidéo", "join-without-join-code": "Rejoindre sans code d'adhésion", "join-without-join-code_description": "Autorisation de contourner le code d'adhésion dans les canaux où ce code est activé", - "Joined": "A rejoint", "joined": "A rejoint", "Joined_at": "A rejoint à", "Jump": "Aller", @@ -4869,4 +4868,4 @@ "Enterprise": "Entreprise", "UpgradeToGetMore_engagement-dashboard_Title": "Analyses", "UpgradeToGetMore_auditing_Title": "Audit des messages" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/he.i18n.json b/packages/i18n/src/locales/he.i18n.json index 1725f2d9a08cd..4cc6f289d27a9 100644 --- a/packages/i18n/src/locales/he.i18n.json +++ b/packages/i18n/src/locales/he.i18n.json @@ -731,7 +731,6 @@ "Join_the_Community": "הצטרפות לקהילה", "Join_the_given_channel": "הצטרף לחדר", "Join_video_call": "הצטרף לשיחת וידאו", - "Joined": "הצטרף", "Joined_at": "הצטרף בתאריך", "Jump": "מעבר", "Jump_to_first_unread": "מעבר אל הראשונה שלא נקראה", diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json index 0d8f0f0477b99..c7bada529b4c2 100644 --- a/packages/i18n/src/locales/hi-IN.i18n.json +++ b/packages/i18n/src/locales/hi-IN.i18n.json @@ -6,7 +6,6 @@ "__count__message_pruned": "{{count}} संदेश काट दिया गया", "__count__conversations__period__": "{{count}} बातचीत, {{period}}", "__count__tags__and__count__conversations__period__": "{{count}} टैग और {{conversations}} बातचीत, {{period}}", - "__usersCount__member_joined": "+ {{usersCount}} सदस्य शामिल हुए", "__departments__departments_and__count__conversations__period__": "{{departments}} विभाग और {{count}} बातचीत, {{period}}", "__usersCount__people_will_be_invited": "{{usersCount}} लोगों को आमंत्रित किया जाएगा", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} is no longer {{role}} by {{user_by}}", @@ -2728,7 +2727,6 @@ "Join_my_room_to_start_the_video_call": "वीडियो कॉल शुरू करने के लिए मेरे कमरे से जुड़ें", "join-without-join-code": "बिना जॉइन कोड के शामिल हों", "join-without-join-code_description": "जॉइन कोड सक्षम वाले चैनलों में जॉइन कोड को बायपास करने की अनुमति", - "Joined": "में शामिल हो गए", "joined": "में शामिल हो गए", "Joined_at": "पर शामिल हुए", "JSON": "JSON", diff --git a/packages/i18n/src/locales/hr.i18n.json b/packages/i18n/src/locales/hr.i18n.json index cf710578ace94..56d8d6392b78d 100644 --- a/packages/i18n/src/locales/hr.i18n.json +++ b/packages/i18n/src/locales/hr.i18n.json @@ -1538,7 +1538,6 @@ "Join_video_call": "Pridružite se videopozivu", "join-without-join-code": "Pridružite se bez pridruživanja kodu", "join-without-join-code_description": "Dozvola za zaobilaženje pridruženog koda u kanalima s omogućenim pridruženim kodom", - "Joined": "Član od", "Jump": "Skok", "Jump_to_first_unread": "Skoči na prvu nepročitanu", "Jump_to_message": "Skoči na poruku", diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json index 49290edff6982..6b0fa2bf6dcb4 100644 --- a/packages/i18n/src/locales/hu.i18n.json +++ b/packages/i18n/src/locales/hu.i18n.json @@ -4,8 +4,6 @@ "__count__empty_rooms_will_be_removed_automatically__rooms__": "{{count}} üres szoba automatikusan eltávolításra kerül:
{{rooms}}.", "__count__message_pruned_one": "{{count}} üzenet törölve", "__count__message_pruned_other": "{{count}} üzenet törölve", - "__usersCount__member_joined_one": "+ {{count}} tag csatlakozott", - "__usersCount__member_joined_other": "+ {{count}} tag csatlakozott", "__usersCount__people_will_be_invited": "{{usersCount}} személy lesz meghívva", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} többé már nem {{role}} {{user_by}} által", "__username__was_set__role__by__user_by_": "{{username}} most már {{role}} {{user_by}} által", @@ -2534,7 +2532,6 @@ "Join_my_room_to_start_the_video_call": "Csatlakozás a szobámhoz a videohívás indításához", "join-without-join-code": "Csatlakozás csatlakozási kód nélkül", "join-without-join-code_description": "Jogosultság a csatlakozási kód megkerüléséhez olyan csatornákon, ahol a csatlakozási kód engedélyezve van", - "Joined": "Csatlakozva", "joined": "csatlakozva", "Joined_at": "Csatlakozva ekkor:", "JSON": "JSON", diff --git a/packages/i18n/src/locales/id.i18n.json b/packages/i18n/src/locales/id.i18n.json index e66a03ea31da0..4bd6294ebdf31 100644 --- a/packages/i18n/src/locales/id.i18n.json +++ b/packages/i18n/src/locales/id.i18n.json @@ -1408,7 +1408,6 @@ "Join_video_call": "Bergabung dengan video call", "join-without-join-code": "Bergabung Tanpa Kode Gabung", "join-without-join-code_description": "Izin untuk memotong kode bergabung di saluran dengan kode bergabung diaktifkan", - "Joined": "bergabung", "Jump": "Melompat", "Jump_to_first_unread": "Langsung ke belum dibaca pertama", "Jump_to_message": "Langsung ke pesan", diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json index 3b24cb4ce1a58..5920f36822799 100644 --- a/packages/i18n/src/locales/it.i18n.json +++ b/packages/i18n/src/locales/it.i18n.json @@ -9,15 +9,12 @@ "__count__conversations__period__": "{{count}} conversazioni, {{period}}", "__count__tags__and__count__conversations__period__": "{{count}} tag e {{conversations}} conversazioni, {{period}}", "__departments__departments_and__count__conversations__period__": "{{departments}} reparti e {{count}} conversazioni, {{period}}", - "__usersCount__member_joined_one": "+ {{count}} membro si è unito", - "__usersCount__member_joined_other": "+ {{count}} membri si sono uniti", "__usersCount__people_will_be_invited": "{{usersCount}} persone saranno invitate", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} non è più {{role}}, da {{user_by}}", "__username__was_set__role__by__user_by_": "A {{username}} è stato assegnato il ruolo di {{role}} da {{user_by}}", "__count__without__department__": "{{count}} senza reparto", "__count__without__tags__": "{{count}} senza tag", "__count__without__assignee__": "{{count}} non assegnate", - "__usersCount__member_joined_many": "+ {{count}} membri si sono uniti", "removed__username__as__role_": "ha rimosso {{username}} come {{role}}", "set__username__as__role_": "ha impostato {{username}} come {{role}}", "This_room_encryption_has_been_enabled_by__username_": "La crittografia di questa stanza è stata attivata da {{username}}", @@ -1826,7 +1823,6 @@ "Join_video_call": "Partecipa alla videochiamata", "join-without-join-code": "Iscriviti senza unire il codice", "join-without-join-code_description": "Autorizzazione a bypassare il codice di join nei canali con codice di abilitazione abilitato", - "Joined": "Entrato", "joined": "unito", "Joined_at": "Iscritto a", "Jump": "Salta", @@ -3391,4 +3387,4 @@ "UpgradeToGetMore_custom-roles_Title": "Ruoli personalizzati", "Video_call_manager": "Gestore di videochiamate", "Sync_license_update_Callout_Title": "Stiamo aggiornando la vostra licenza" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json index 03bda32e7b013..73c0ccd14b317 100644 --- a/packages/i18n/src/locales/ja.i18n.json +++ b/packages/i18n/src/locales/ja.i18n.json @@ -2291,7 +2291,6 @@ "Join_my_room_to_start_the_video_call": "マイルームに参加してビデオ通話を開始", "join-without-join-code": "参加コードなしで参加", "join-without-join-code_description": "参加コードを有効にしたチャネルで参加コードをバイパスする権限", - "Joined": "参加中", "Joined_at": "参加時刻", "Jump": "移動", "Jump_to_first_unread": "最初の未読へ移動", @@ -4812,4 +4811,4 @@ "Enterprise": "エンタープライズ", "UpgradeToGetMore_engagement-dashboard_Title": "分析", "UpgradeToGetMore_auditing_Title": "メッセージ監査" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/ka-GE.i18n.json b/packages/i18n/src/locales/ka-GE.i18n.json index 5f92073f00b3c..d4f2de06546b7 100644 --- a/packages/i18n/src/locales/ka-GE.i18n.json +++ b/packages/i18n/src/locales/ka-GE.i18n.json @@ -1884,7 +1884,6 @@ "Join_video_call": "შეუერთდით ვიდეო ზარს", "join-without-join-code": "შეერთების კოდის გარეშე შეერთება", "join-without-join-code_description": "შეერთების კოდის გვერდის ავლის ნებართვა, არხებისთვის რომელთაც შეერთების კოდი გააქტიურებული აქვთ", - "Joined": "შემოუერთდა", "Jump": "გადახტომა", "Jump_to_first_unread": "გადასვლა პირველ წაუკითხავზე", "Jump_to_message": "გადასვლა შეტყობინებაზე", @@ -3663,4 +3662,4 @@ "onboarding.form.registerOfflineForm.title": "ხელით დარეგისტრირება", "UpgradeToGetMore_engagement-dashboard_Title": "ანალიტიკა", "UpgradeToGetMore_auditing_Title": "შეტყობინებების შემოწმება" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json index 171dce974e0da..f6893349cdab9 100644 --- a/packages/i18n/src/locales/km.i18n.json +++ b/packages/i18n/src/locales/km.i18n.json @@ -1677,7 +1677,6 @@ "Join_video_call": "ចូលរួមក្នុងការហៅវីដេអូ", "join-without-join-code": "ចូលរួមដោយគ្មានការចូលរួមកូដ", "join-without-join-code_description": "ការអនុញ្ញាតឆ្លងកាត់កូដភ្ជាប់នៅក្នុងឆានែលដែលបានភ្ជាប់កូដ", - "Joined": "ចូលបម្រើការងារ", "Jump": "លោត", "Jump_to_first_unread": "លោតទៅមិនទាន់អាន​​ដំបូង", "Jump_to_message": "លោតទៅសារ", diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json index 7eec12896d9d3..72667cf60692e 100644 --- a/packages/i18n/src/locales/ko.i18n.json +++ b/packages/i18n/src/locales/ko.i18n.json @@ -2040,7 +2040,6 @@ "Join_video_call": "화상 통화에 참여", "join-without-join-code": "가입 코드없이 가입", "join-without-join-code_description": "참여 코드가 활성화 된 채널에서 참여 코드를 무시할 수있는 권한", - "Joined": "가입", "Joined_at": "에 가입", "Jump": "이동", "Jump_to_first_unread": "읽지않은 첫 메시지로 이동", @@ -4020,4 +4019,4 @@ "Enterprise": "기업", "UpgradeToGetMore_engagement-dashboard_Title": "분석(에널리틱스)", "UpgradeToGetMore_auditing_Title": "메시지 감사" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/ku.i18n.json b/packages/i18n/src/locales/ku.i18n.json index c5f1d9904b4d8..c0e9bb820059c 100644 --- a/packages/i18n/src/locales/ku.i18n.json +++ b/packages/i18n/src/locales/ku.i18n.json @@ -1403,7 +1403,6 @@ "Join_video_call": "Join banga video", "join-without-join-code": "Tevlêbûna Kodê", "join-without-join-code_description": "Destûra ku li ser kanalên ku di navnîşana kodê de pêk tê de bi kodê bibin", - "Joined": "Xeydkirinê", "Jump": "Helperkîn", "Jump_to_first_unread": "Here cem nexwendî yekem", "Jump_to_message": "Here cem message", diff --git a/packages/i18n/src/locales/lo.i18n.json b/packages/i18n/src/locales/lo.i18n.json index 586b980c9d5ea..8738dd3ac31e4 100644 --- a/packages/i18n/src/locales/lo.i18n.json +++ b/packages/i18n/src/locales/lo.i18n.json @@ -1444,7 +1444,6 @@ "Join_video_call": "ເຂົ້າຮ່ວມການໂທວິດີໂອ", "join-without-join-code": "ເຂົ້າຮ່ວມໂດຍບໍ່ເຂົ້າຮ່ວມລະຫັດ", "join-without-join-code_description": "ການອະນຸຍາດທີ່ຈະຂ້າມລະຫັດເຂົ້າຮ່ວມໃນຊ່ອງທີ່ມີລະຫັດການເຂົ້າຮ່ວມທີ່ຖືກເປີດໃຊ້", - "Joined": "ເຂົ້າຮ່ວມ", "Jump": "ໄປ", "Jump_to_first_unread": "ໄປຫາຂໍ້ຄວາມທໍາອິດ", "Jump_to_message": "ໄປຫາຂໍ້ຄວາມ", diff --git a/packages/i18n/src/locales/lt.i18n.json b/packages/i18n/src/locales/lt.i18n.json index ffa444f4f91f3..cf900a54ae7ce 100644 --- a/packages/i18n/src/locales/lt.i18n.json +++ b/packages/i18n/src/locales/lt.i18n.json @@ -1463,7 +1463,6 @@ "Join_video_call": "Prisijungti prie vaizdo skambučio", "join-without-join-code": "Prisijungti be prisijungimo kodo", "join-without-join-code_description": "Leidimas apeiti prisijungimo kodą kanaluose, kuriuose įjungtas prisijungimo kodas", - "Joined": "Prisijungė", "Jump": "Šokinėti", "Jump_to_first_unread": "Peršokti į pirmą neskaitytą", "Jump_to_message": "Peršokti į pranešimą", diff --git a/packages/i18n/src/locales/lv.i18n.json b/packages/i18n/src/locales/lv.i18n.json index e431ea7a76fd9..f2249e1468909 100644 --- a/packages/i18n/src/locales/lv.i18n.json +++ b/packages/i18n/src/locales/lv.i18n.json @@ -1421,7 +1421,6 @@ "Join_video_call": "Pievienotieties videozvanam", "join-without-join-code": "Pievienoties bez pievienošanās koda", "join-without-join-code_description": "Atļauja apiet pievienošanās kodu kanālos, kuros ir iespējots pievienošanās kods", - "Joined": "Pievienojies", "Jump": "Pāriet", "Jump_to_first_unread": "Pāriet uz pirmo nelasīto", "Jump_to_message": "Pāriet uz ziņojumu", diff --git a/packages/i18n/src/locales/mn.i18n.json b/packages/i18n/src/locales/mn.i18n.json index 41ee0742200a1..d44a0dc7f2f3a 100644 --- a/packages/i18n/src/locales/mn.i18n.json +++ b/packages/i18n/src/locales/mn.i18n.json @@ -1403,7 +1403,6 @@ "Join_video_call": "Видео дуудлагад нэгдэх", "join-without-join-code": "Join Without Code гэж нэгдэх", "join-without-join-code_description": "Кодыг идэвхжүүлсэн сувгаар сувагт нэгтгэх кодыг тойрч гарах зөвшөөрөл", - "Joined": "Гишүүнээр элссэн", "Jump": "Үсрэх", "Jump_to_first_unread": "Эхлээд уншаагүй", "Jump_to_message": "Зурвас руу очих", diff --git a/packages/i18n/src/locales/ms-MY.i18n.json b/packages/i18n/src/locales/ms-MY.i18n.json index 4bc7c78c631a9..d16bdf9ccc1c0 100644 --- a/packages/i18n/src/locales/ms-MY.i18n.json +++ b/packages/i18n/src/locales/ms-MY.i18n.json @@ -1406,7 +1406,6 @@ "Join_video_call": "Menyertai panggilan video", "join-without-join-code": "Bergabung Tanpa Kod Bergabung", "join-without-join-code_description": "Kebenaran untuk memintas kod gabungan dalam saluran dengan memasukkan kod yang didayakan", - "Joined": "menyertai", "Jump": "Jump", "Jump_to_first_unread": "Lompat ke belum dibaca pertama", "Jump_to_message": "Lompat ke mesej", diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json index 5c1e44037085e..3705c8c09f65e 100644 --- a/packages/i18n/src/locales/nl.i18n.json +++ b/packages/i18n/src/locales/nl.i18n.json @@ -2310,7 +2310,6 @@ "Join_my_room_to_start_the_video_call": "Word lid van mijn kamer om het videogesprek te starten", "join-without-join-code": "Word lid zonder deelnamecode", "join-without-join-code_description": "Toestemming om de deelnamecode te omzeilen in kanalen waarvoor join-code is ingeschakeld", - "Joined": "Toegetreden", "Joined_at": "Toegetreden op", "Jump": "Springen", "Jump_to_first_unread": "Ga naar eerste ongelezen", @@ -4854,4 +4853,4 @@ "Enterprise": "Onderneming", "UpgradeToGetMore_engagement-dashboard_Title": "Analytics", "UpgradeToGetMore_auditing_Title": "Bericht auditing" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/nn.i18n.json b/packages/i18n/src/locales/nn.i18n.json index 2492069ff546d..7b2a9e8474a5f 100644 --- a/packages/i18n/src/locales/nn.i18n.json +++ b/packages/i18n/src/locales/nn.i18n.json @@ -8,8 +8,6 @@ "__count__conversations__period__": "{{count}} samtaler, {{period}}", "__count__tags__and__count__conversations__period__": "{{count}}-tagger og {{conversations}}-samtaler, {{period}}", "__departments__departments_and__count__conversations__period__": "{{departments}} avdelinger og {{count}} samtaler, {{period}}", - "__usersCount__member_joined_one": "+ {{count}} medlem ble med", - "__usersCount__member_joined_other": "+ {{count}} medlemmer ble med", "__usersCount__people_will_be_invited": "{{usersCount}} personer blir invitert", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} er ikke lenger {{role}} av {{user_by}}", "__username__was_set__role__by__user_by_": "{{username}} ble satt {{role}} av {{user_by}}", @@ -2405,7 +2403,6 @@ "Join_my_room_to_start_the_video_call": "Bli med i rommet mitt for å starte videosamtalen", "join-without-join-code": "Bli med uten å delta koden", "join-without-join-code_description": "Tillatelse til å omgå tilkoblingskoden i kanaler med tilkoblingskode aktivert", - "Joined": "Ble med", "joined": "ble med", "Joined_at": "Ble med klokken", "JSON": "JSON", diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json index a7551c2b88a92..9c772373fd0b2 100644 --- a/packages/i18n/src/locales/no.i18n.json +++ b/packages/i18n/src/locales/no.i18n.json @@ -8,8 +8,6 @@ "__count__conversations__period__": "{{count}} samtaler, {{period}}", "__count__tags__and__count__conversations__period__": "{{count}}-tagger og {{conversations}}-samtaler, {{period}}", "__departments__departments_and__count__conversations__period__": "{{departments}} avdelinger og {{count}} samtaler, {{period}}", - "__usersCount__member_joined_one": "+ {{count}} medlem ble med", - "__usersCount__member_joined_other": "+ {{count}} medlemmer ble med", "__usersCount__people_will_be_invited": "{{usersCount}} personer blir invitert", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} er ikke lenger {{role}} av {{user_by}}", "__username__was_set__role__by__user_by_": "{{username}} ble satt {{role}} av {{user_by}}", @@ -2405,7 +2403,6 @@ "Join_my_room_to_start_the_video_call": "Bli med i rommet mitt for å starte videosamtalen", "join-without-join-code": "Bli med uten å delta koden", "join-without-join-code_description": "Tillatelse til å omgå tilkoblingskoden i kanaler med tilkoblingskode aktivert", - "Joined": "Ble med", "joined": "ble med", "Joined_at": "Ble med klokken", "JSON": "JSON", diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json index de825baf131c4..2612e7161761c 100644 --- a/packages/i18n/src/locales/pl.i18n.json +++ b/packages/i18n/src/locales/pl.i18n.json @@ -10,9 +10,6 @@ "__count__conversations__period__": "{{count}} rozmowy, {{period}}", "__count__tags__and__count__conversations__period__": "{{count}} tagów i {{conversations}} konwersacji, {{period}}", "__departments__departments_and__count__conversations__period__": "{{departments}} działów i {{count}} rozmów, {{period}}", - "__usersCount__member_joined_few": "+ {{count}} członków dołączyło", - "__usersCount__member_joined_one": "+ {{count}} członek dołączył", - "__usersCount__member_joined_other": "+ {{count}} członków dołączyło", "__usersCount__people_will_be_invited": "{{usersCount}} ludzi zostanie zostanie zaproszonych", "__username__is_no_longer__role__defined_by__user_by_": "Użytkownik {{username}} nie ma już roli {{role}}; zmienił to użytkownik {{user_by}}", "__username__was_set__role__by__user_by_": "Użytkownik {{username}} otrzymał rolę {{role}} od użytkownika {{user_by}}", @@ -20,7 +17,6 @@ "__count__without__tags__": "{{count}} bez tagów", "__count__without__assignee__": "{{count}} bez przypisania", "__roomName__was_added_to_favorites": "{{roomName}} został dodany do ulubionych", - "__usersCount__member_joined_many": "+ {{count}} członków dołączyło", "__roomName__was_removed_from_favorites": "{{roomName}} został usunięty z ulubionych", "__roomName__is_encrypted": "{{roomName}} jest szyfrowany", "__roomName__encryption_keys_need_to_be_updated": "{{roomName}} klucze szyfrowania muszą zostać zaktualizowane, aby umożliwić dostęp. Aby tak się stało, inny członek pokoju musi być online.", @@ -2556,7 +2552,6 @@ "Join_my_room_to_start_the_video_call": "Dołącz do mojego pokoju, aby rozpocząć rozmowę wideo", "join-without-join-code": "Dołącz bez kodu dołączania", "join-without-join-code_description": "Zezwolenie na ominięcie kodu dołączania w kanałach z włączonym kodem łączenia", - "Joined": "Dołączył", "joined": "dołączono", "Joined_at": "Dołączył o", "JSON": "JSON", diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json index a0ec01880a8f7..f3973aab1c9db 100644 --- a/packages/i18n/src/locales/pt-BR.i18n.json +++ b/packages/i18n/src/locales/pt-BR.i18n.json @@ -9,15 +9,12 @@ "__count__conversations__period__": "{{count}} conversas, {{period}}", "__count__tags__and__count__conversations__period__": "{{count}} tags e {{conversations}} conversas, {{period}}", "__departments__departments_and__count__conversations__period__": "{{departments}} departmentos e {{count}} conversas, {{period}}", - "__usersCount__member_joined_one": "+ um membro entrou", - "__usersCount__member_joined_other": "+ {{count}} membros entraram", "__usersCount__people_will_be_invited": "{{usersCount}} usuários vão ser convidados", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} não pertence mais a {{role}}, por {{user_by}}", "__username__was_set__role__by__user_by_": "{{username}} foi definido como {{role}} por {{user_by}}", "__count__without__department__": "{{count}} sem departamento", "__count__without__tags__": "{{count}} sem tags", "__count__without__assignee__": "{{count}} sem responsável", - "__usersCount__member_joined_many": "+ {{count}} membros entraram", "This_room_encryption_has_been_enabled_by__username_": "A criptografia desta sala foi ativada por {{username}}", "This_room_encryption_has_been_disabled_by__username_": "A criptografia desta sala foi desativada por {{username}}", "Enabled_E2E_Encryption_for_this_room": "Encriptação E2E habilitada para essa sala", @@ -776,8 +773,8 @@ "Cancel_message_input": "Cancelar", "Canceled": "Cancelado", "Cancel_subscription": "Cancelar assinatura", - "Cancel__planName__subscription": "Cancelar assinatura do plano {{planName}}", - "Cancel_subscription_message": "Este workspace será migrado para a versão Community, perdendo acesso gratuito a recursos premium.

Ainda será possível usar o Rocket.Chat, mas sua equipe perderá acesso a integrações e notificações push ilimitadas, confirmação de leitura de mensagens <4>e outras funcionalidades.", + "Cancel__planName__subscription": "Cancelar assinatura do plano {{planName}}", + "Cancel_subscription_message": "Este workspace será migrado para a versão Community, perdendo acesso gratuito a recursos premium.

Ainda será possível usar o Rocket.Chat, mas sua equipe perderá acesso a integrações e notificações push ilimitadas, confirmação de leitura de mensagens <4>e outras funcionalidades.", "Canned_Response_Created": "Resposta modelo criada", "Canned_Response_Updated": "Resposta modelo atualizada", "Canned_Response_Delete_Warning": "A exclusão de uma resposta modelo não pode ser desfeita.", @@ -2402,7 +2399,6 @@ "Join_my_room_to_start_the_video_call": "Participar da minha sala para iniciar chamada de vídeo", "join-without-join-code": "Cadastre-se sem se juntar ao código", "join-without-join-code_description": "Permissão para ignorar o código de associação em canais com o código de associação ativado", - "Joined": "Entrou", "Joined_at": "Entrou em", "Jump": "Saltar", "Jump_to_first_unread": "Ir para primeira mensagem não lida", @@ -5108,4 +5104,4 @@ "Recent": "Reciente", "On_All_Contacts": "Em todos os contatos", "Once": "Um vez" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/pt.i18n.json b/packages/i18n/src/locales/pt.i18n.json index 6bfb89c16c388..4aa6a81bc790d 100644 --- a/packages/i18n/src/locales/pt.i18n.json +++ b/packages/i18n/src/locales/pt.i18n.json @@ -1665,7 +1665,6 @@ "Join_video_call": "Entrar na chamada de vídeo", "join-without-join-code": "Registe-se sem se juntar ao código", "join-without-join-code_description": "Permissão para ignorar o código de associação em canais com o código de associação activado", - "Joined": "Entrou", "Jump": "Saltar", "Jump_to_first_unread": "Ir para primeira mensagem não lida", "Jump_to_message": "Ir para mensagem", @@ -3168,4 +3167,4 @@ "registration.component.form.sendConfirmationEmail": "Enviar email de confirmação", "Enterprise": "Empreendimento", "UpgradeToGetMore_engagement-dashboard_Title": "Analytics" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/ro.i18n.json b/packages/i18n/src/locales/ro.i18n.json index 20b8f80c1fcfb..53d4b5f742664 100644 --- a/packages/i18n/src/locales/ro.i18n.json +++ b/packages/i18n/src/locales/ro.i18n.json @@ -1407,7 +1407,6 @@ "Join_video_call": "Intră în apel video", "join-without-join-code": "Alăturați-vă fără a intra în cod", "join-without-join-code_description": "Permisiunea de a ocoli codul de înscriere în canalele cu cod de conectare activat", - "Joined": "Inregistrat pe", "Jump": "A sari", "Jump_to_first_unread": "Salt la primul mesaj necitit", "Jump_to_message": "Salt la mesaj", diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json index c67ea53478031..16f31e1b1640a 100644 --- a/packages/i18n/src/locales/ru.i18n.json +++ b/packages/i18n/src/locales/ru.i18n.json @@ -6,13 +6,9 @@ "__count__message_pruned_one": "{{count}} сообщение удалено", "__count__message_pruned_other": "{{count}} сообщений удалено", "__count__message_pruned_many": "{{count}} сообщений удалено", - "__usersCount__member_joined_few": "+ {{count}} участников присоединилось", - "__usersCount__member_joined_one": "+ {{count}} участников присоединилось", - "__usersCount__member_joined_other": "+ {{count}} участников присоединилось", "__usersCount__people_will_be_invited": "{{usersCount}} человек будет приглашено", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} больше не {{role}} по решению {{user_by}}", "__username__was_set__role__by__user_by_": "{{username}} был установлен {{role}} по решению {{user_by}}", - "__usersCount__member_joined_many": "+ {{count}} участников присоединилось", "This_room_encryption_has_been_enabled_by__username_": "Шифрование этой комнаты было включено {{username}}", "This_room_encryption_has_been_disabled_by__username_": "Шифрование этой комнаты было отключено {{username}}", "Enabled_E2E_Encryption_for_this_room": "включено шифрование E2E для этой комнаты", @@ -2464,7 +2460,6 @@ "Join_my_room_to_start_the_video_call": "Присоединиться к моей комнате, чтобы начать видеовызов", "join-without-join-code": "Присоединяться к публичным чатам без кода входа", "join-without-join-code_description": "Разрешение пропускать код присоединения для публичных чатов с включенным кодом входа", - "Joined": "Участвую", "Joined_at": "Присоединился в", "Jump": "Перейти", "Jump_to_first_unread": "Перейти к первому непрочитанному", @@ -5076,4 +5071,4 @@ "Enterprise": "Корпорация", "UpgradeToGetMore_engagement-dashboard_Title": "Аналитика", "UpgradeToGetMore_auditing_Title": "Аудит сообщений" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/se.i18n.json b/packages/i18n/src/locales/se.i18n.json index e9ac61c3b292c..7ce34113a08ba 100644 --- a/packages/i18n/src/locales/se.i18n.json +++ b/packages/i18n/src/locales/se.i18n.json @@ -9,9 +9,6 @@ "__count__conversations__period__": "{{count}} conversations, {{period}}", "__count__tags__and__count__conversations__period__": "{{count}} tags and {{conversations}} conversations, {{period}}", "__departments__departments_and__count__conversations__period__": "{{departments}} departments and {{count}} conversations, {{period}}", - "__usersCount__member_joined_one": "+ {{count}} member joined", - "__usersCount__member_joined_other": "+ {{count}} members joined", - "__usersCount__member_joined_two": "+ {{count}} members joined", "__usersCount__people_will_be_invited": "{{usersCount}} people will be invited", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} is no longer {{role}} by {{user_by}}", "__username__was_set__role__by__user_by_": "{{username}} was set {{role}} by {{user_by}}", @@ -2893,7 +2890,6 @@ "Join_my_room_to_start_the_video_call": "Join my room to start the video call", "join-without-join-code": "Join Without Join Code", "join-without-join-code_description": "Permission to bypass the join code in channels with join code enabled", - "Joined": "Joined", "joined": "joined", "Joined_at": "Joined at", "JSON": "JSON", diff --git a/packages/i18n/src/locales/sk-SK.i18n.json b/packages/i18n/src/locales/sk-SK.i18n.json index 3752b5eb51d5c..ce1bf188d3d2c 100644 --- a/packages/i18n/src/locales/sk-SK.i18n.json +++ b/packages/i18n/src/locales/sk-SK.i18n.json @@ -1418,7 +1418,6 @@ "Join_video_call": "Pripojte sa k videohovoru", "join-without-join-code": "Pripojte sa bez kódu pripojenia", "join-without-join-code_description": "Povolenie vynechať spojovací kód v kanáloch s povoleným kódom vstupu", - "Joined": "pripojený", "Jump": "Jump", "Jump_to_first_unread": "Prejsť na prvé neprečítané", "Jump_to_message": "Prejsť na správu", diff --git a/packages/i18n/src/locales/sl-SI.i18n.json b/packages/i18n/src/locales/sl-SI.i18n.json index 4c7a60b647a32..d7198011197c4 100644 --- a/packages/i18n/src/locales/sl-SI.i18n.json +++ b/packages/i18n/src/locales/sl-SI.i18n.json @@ -1398,7 +1398,6 @@ "Join_video_call": "Pridružite se videoklicu", "join-without-join-code": "Pridružitev brez kode", "join-without-join-code_description": "Dovoljenje za obvoz kode za pridružitev v kanalih z omogočeno kodo", - "Joined": "Pridružen", "Jump": "Pojdi", "Jump_to_first_unread": "Pojdi na prvo neprebrano sporočilo", "Jump_to_message": "Pojdi na sporočila", diff --git a/packages/i18n/src/locales/sq.i18n.json b/packages/i18n/src/locales/sq.i18n.json index d31e785d9678f..b202c73c17063 100644 --- a/packages/i18n/src/locales/sq.i18n.json +++ b/packages/i18n/src/locales/sq.i18n.json @@ -1407,7 +1407,6 @@ "Join_video_call": "Join thirrje video", "join-without-join-code": "Bashkohu pa bashkuar kodin", "join-without-join-code_description": "Leja për të anashkaluar kodin e bashkëngjitjes në kanalet me kodin bashkangjitur të aktivizuar", - "Joined": "Regjistruar më", "Jump": "Jump", "Jump_to_first_unread": "Kërce tek palexuara parë", "Jump_to_message": "Kërce tek mesazhi", diff --git a/packages/i18n/src/locales/sr.i18n.json b/packages/i18n/src/locales/sr.i18n.json index abc26ba1f7fe1..7ca4d30271489 100644 --- a/packages/i18n/src/locales/sr.i18n.json +++ b/packages/i18n/src/locales/sr.i18n.json @@ -1243,7 +1243,6 @@ "Join_video_call": "Придружите видео позив", "join-without-join-code": "Придружите се без пријављеног кода", "join-without-join-code_description": "Дозвола да се заобиђе приступни код у каналима са омогућеним приступним кодом", - "Joined": "Придружио", "Jump": "јумп", "Jump_to_first_unread": "Скок на прву непрочитану", "Jump_to_message": "Скочи на поруку", diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json index 572ddddf418e3..b8f3e6cf3f723 100644 --- a/packages/i18n/src/locales/sv.i18n.json +++ b/packages/i18n/src/locales/sv.i18n.json @@ -5,8 +5,6 @@ "__count__empty_rooms_will_be_removed_automatically__rooms__": "{{count}} tomma rum tas bort automatiskt:
{{rooms}}.", "__count__message_pruned_one": "{{count}} meddelande rensat", "__count__message_pruned_other": "{{count}} meddelanden rensade", - "__usersCount__member_joined_one": "+ {{count}} medlem har anslutit", - "__usersCount__member_joined_other": "+ {{count}} medlemmar har anslutit", "__usersCount__people_will_be_invited": "{{usersCount}} personer bjuds in", "__username__is_no_longer__role__defined_by__user_by_": "{{username}} är inte längre {{role}}, av {{user_by}}", "__username__was_set__role__by__user_by_": "{{username}} sattes {{role}} av {{user_by}}", @@ -2625,7 +2623,6 @@ "Join_my_room_to_start_the_video_call": "Anslut till mitt rum för att starta videosamtalet", "join-without-join-code": "Gå med utan anslutningskod", "join-without-join-code_description": "Tillstånd att kringgå anslutningskoden i kanaler med anslutningskod aktiverad", - "Joined": "Ansluten", "joined": "anslöt", "Joined_at": "Anslöt", "JSON": "JSON", diff --git a/packages/i18n/src/locales/ta-IN.i18n.json b/packages/i18n/src/locales/ta-IN.i18n.json index 130a0cdefafb4..ee93281a64735 100644 --- a/packages/i18n/src/locales/ta-IN.i18n.json +++ b/packages/i18n/src/locales/ta-IN.i18n.json @@ -1407,7 +1407,6 @@ "Join_video_call": "வீடியோ அழைப்பில் சேர்க", "join-without-join-code": "குறியீடு இல்லாமல் சேர இல்லாமல் சேருங்கள்", "join-without-join-code_description": "சேர குறியீடு மூலம் சேனல்களில் சேருவதற்கான குறியீட்டை கடக்க அனுமதி", - "Joined": "Joined", "Jump": "குதி", "Jump_to_first_unread": "முதல் படிக்காத தாவிச்", "Jump_to_message": "செய்தி தாவிச்", diff --git a/packages/i18n/src/locales/th-TH.i18n.json b/packages/i18n/src/locales/th-TH.i18n.json index 6a0bd32e892b2..a613a89b9b69e 100644 --- a/packages/i18n/src/locales/th-TH.i18n.json +++ b/packages/i18n/src/locales/th-TH.i18n.json @@ -1402,7 +1402,6 @@ "Join_video_call": "เข้าร่วมแฮงเอาท์วิดีโอ", "join-without-join-code": "เข้าร่วมโดยไม่ต้องเข้าร่วมรหัส", "join-without-join-code_description": "อนุญาตให้ข้ามรหัสเข้าร่วมในช่องที่มีรหัสเข้าร่วม", - "Joined": "วันที่สมัครสมาชิก", "Jump": "กระโดด", "Jump_to_first_unread": "ข้ามไปยังข้อความแรกที่ยังไม่ได้อ่าน", "Jump_to_message": "ข้ามไปที่ข้อความ", diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json index d4e670b60f3df..1c7d0bb8be451 100644 --- a/packages/i18n/src/locales/tr.i18n.json +++ b/packages/i18n/src/locales/tr.i18n.json @@ -1691,7 +1691,6 @@ "Join_video_call": "Video görüşmesine katılın", "join-without-join-code": "Üyelik Kodu Olmadan Katıl", "join-without-join-code_description": "Katılma kodunun etkin olduğu kanallardaki birleştirme kodunu atlama izni", - "Joined": "Katılım", "Joined_at": "Katıldı", "Jump": "Şuraya atla", "Jump_to_first_unread": "Okunmamış ilk iletiye git", diff --git a/packages/i18n/src/locales/ug.i18n.json b/packages/i18n/src/locales/ug.i18n.json index dc9d0eaf09188..c066dc90fddc5 100644 --- a/packages/i18n/src/locales/ug.i18n.json +++ b/packages/i18n/src/locales/ug.i18n.json @@ -557,7 +557,6 @@ "Join_the_Community": "ئىجتىمائىي رايونغا قوشۇلۇش", "Join_the_given_channel": "بۇ قانالغا قوشۇلۇش", "Join_video_call": "ۋىدېئولۇق سۆھبەتكە قوشۇلۇش", - "Joined": "ئاللىبۇرۇن قوشۇلدى", "Jump": "سەكرەپ يۆتكىلىش", "Jump_to_first_unread": "ئوقۇلمىغان بىرىنچى ئۇچۇرغا سەكرەپ يۆتكىلىش", "Jump_to_message": "ئۇچۇرغا سەكرەپ يۆتكىلىش", diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json index 2215d6e3bd8a8..e8d14b7f8fc00 100644 --- a/packages/i18n/src/locales/uk.i18n.json +++ b/packages/i18n/src/locales/uk.i18n.json @@ -1849,7 +1849,6 @@ "Join_video_call": "Реєстрація відеодзвінка", "join-without-join-code": "Приєднуйтесь без приєднання", "join-without-join-code_description": "Дозвіл обходити код приєднання в каналах з включеним кодом приєднання", - "Joined": "Реєстрація", "Jump": "Перейти", "Jump_to_first_unread": "Перейти до першого непрочитаного", "Jump_to_message": "Перейти до повідомлення", @@ -3343,4 +3342,4 @@ "Enterprise": "Підприємство", "UpgradeToGetMore_engagement-dashboard_Title": "Аналітика", "UpgradeToGetMore_auditing_Title": "Аудит повідомлень" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/vi-VN.i18n.json b/packages/i18n/src/locales/vi-VN.i18n.json index e96ec917a6ea7..6ec1c662fc5be 100644 --- a/packages/i18n/src/locales/vi-VN.i18n.json +++ b/packages/i18n/src/locales/vi-VN.i18n.json @@ -1501,7 +1501,6 @@ "Join_video_call": "Tham gia cuộc gọi điện video", "join-without-join-code": "Tham gia Nếu không có Mã Tham gia", "join-without-join-code_description": "Cho phép bỏ qua mã kết nối trong các kênh với mã cho phép tham gia", - "Joined": "Gia nhập", "Jump": "Nhảy", "Jump_to_first_unread": "Chuyển đến đầu tiên chưa đọc", "Jump_to_message": "Chuyển đến tin nhắn", diff --git a/packages/i18n/src/locales/zh-HK.i18n.json b/packages/i18n/src/locales/zh-HK.i18n.json index e6c0616d34f1e..155981160d3f7 100644 --- a/packages/i18n/src/locales/zh-HK.i18n.json +++ b/packages/i18n/src/locales/zh-HK.i18n.json @@ -1428,7 +1428,6 @@ "Join_video_call": "加入视频通话", "join-without-join-code": "无加入代码的加入", "join-without-join-code_description": "允许绕开启用了连接代码的通道中的连接代码", - "Joined": "加盟", "Jump": "跳", "Jump_to_first_unread": "跳到第一个未读", "Jump_to_message": "跳转到信息", diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json index affee226ac343..33cfdf7886437 100644 --- a/packages/i18n/src/locales/zh-TW.i18n.json +++ b/packages/i18n/src/locales/zh-TW.i18n.json @@ -2265,7 +2265,6 @@ "Join_my_room_to_start_the_video_call": "加入我的房間來啟動視訊通話", "join-without-join-code": "無加入代碼的加入", "join-without-join-code_description": "允許繞開啟用了連接代碼的通道中的連接代碼", - "Joined": "已加入", "Joined_at": "已加入到", "Jump": "跳", "Jump_to_first_unread": "跳轉到首個未讀", @@ -4567,4 +4566,4 @@ "Enterprise": "企業", "UpgradeToGetMore_engagement-dashboard_Title": "分析", "UpgradeToGetMore_auditing_Title": "訊息稽核" -} +} \ No newline at end of file diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json index 1057dd3c766e4..301377b4675ff 100644 --- a/packages/i18n/src/locales/zh.i18n.json +++ b/packages/i18n/src/locales/zh.i18n.json @@ -2076,7 +2076,6 @@ "Join_video_call": "加入视频对话", "join-without-join-code": "无加入码加入", "join-without-join-code_description": "绕过频道加入码的权限", - "Joined": "已加入", "Joined_at": "加入于", "Jump": "跳转", "Jump_to_first_unread": "跳转到第一条未读消息", @@ -4127,4 +4126,4 @@ "Enterprise": "企业", "UpgradeToGetMore_engagement-dashboard_Title": "分析", "UpgradeToGetMore_auditing_Title": "消息审计" -} +} \ No newline at end of file diff --git a/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessage.stories.tsx b/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessage.stories.tsx index 091305d18dfcc..0198e4de29896 100644 --- a/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessage.stories.tsx +++ b/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessage.stories.tsx @@ -45,6 +45,14 @@ export default { const avatarUrl = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAAoACgDASIAAhEBAxEB/8QAGwAAAgIDAQAAAAAAAAAAAAAAAAcEBgIDBQj/xAAuEAACAQQAAwcEAQUAAAAAAAABAgMABAUREiExBhMUIkFRYQcWcYGhFTJSgpH/xAAYAQADAQEAAAAAAAAAAAAAAAACAwQBAP/EAB4RAAIBBQEBAQAAAAAAAAAAAAABAgMREiExE0HR/9oADAMBAAIRAxEAPwBuXuIkhBuMe5ib/AHQP49q4L3mLitryTLTSpOiHQI5k/HzXa/qbFOEudVTu1dumWvcTaNCZYZ7vU6g6LxqjOU/24dfs1Ouh9FnkMpd3Reeyx83hAxZZEhkdV9/MBrX71WGPvJcqrJBGveKATtuXXqNU0pu02bTHXD/AGvJAluyxxRd6F4x00o+NdKoVrjbzJdvVe1t5cVLc2ck8qjnohgpPtz2v7G6JtPQ2VJwjlcw+37mchpnK6GtIuv5NFWeTsLNPvxWTvpfjvOEfwKKzEVkSct2vscS/BIzSN0YRkeX81UpPqO8masJETu7OOccY4dswYFQeftv096XV5knuJGdm2T1+agvMXj8jEaHX905QihabvcbuS7X566mLWLwSY8PuRnk/u4eZ0deTl71Ef6hY+0yM88TzeNZY4luYwpVYyduOfrvhPTnr0pXSX9y5mCsyJMdyxxvwq599em+taItqCSNc90ChvZRUruUcT0JiO18Elpk7t8v41LWzacxkBSuvjQ/FFJayjDWrCTepAQ2vUH0oo/Jk3ovpwJJeVCP5CN+lFFaaMqy+nAyuChvrTI2kN9JAsi2ZOy4IBHMnkSCP+iqBexSWdxLazoUljJVlPUH2oorkV10pRc7b1zXb/hZOzuJvM86QWEXeELxOzHSIPcmiiiunVlF2RNTpRkrs//Z'; +const fakeUsers = Array.from({ length: 10 }).map((_, i) => ({ + username: `user${i}`, + ts: new Date().toISOString(), + name: `User ${i}`, + _id: `id${i}`, + avatarETag: '', +})); + export const CallingDM: StoryFn = () => ( @@ -94,8 +102,8 @@ export const CallOngoing: StoryFn = () => ( Join - - Joined + + joined ); @@ -112,10 +120,29 @@ export const CallEnded: StoryFn = () => ( - - Joined + + joined ); export const Loading: StoryFn = () => ; + +export const NoAvatars: StoryFn = () => ( + + + + + Call ongoing + + + + + + + Join + + {fakeUsers.length} joined + + +); diff --git a/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessageFooterText.tsx b/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessageFooterText.tsx index c4070d1ddfdea..2d986a6258564 100644 --- a/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessageFooterText.tsx +++ b/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessageFooterText.tsx @@ -4,7 +4,7 @@ import type { AllHTMLAttributes, ReactElement } from 'react'; type VideoConfMessageFooterTextProps = Omit, 'is'>; const VideoConfMessageFooterText = ({ children, ...props }: VideoConfMessageFooterTextProps): ReactElement => ( - + {children} ); diff --git a/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessageUserStack.tsx b/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessageUserStack.tsx index 735fe3958709e..724d9ff5a3981 100644 --- a/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessageUserStack.tsx +++ b/packages/ui-video-conf/src/VideoConfMessage/VideoConfMessageUserStack.tsx @@ -1,22 +1,36 @@ import type { IVideoConferenceUser, Serialized } from '@rocket.chat/core-typings'; -import { Avatar, Box } from '@rocket.chat/fuselage'; -import { useUserAvatarPath } from '@rocket.chat/ui-contexts'; +import { Avatar, Box, Icon } from '@rocket.chat/fuselage'; +import { useSetting, useUserAvatarPath, useUserPreference } from '@rocket.chat/ui-contexts'; import { memo, type ReactElement } from 'react'; const MAX_USERS = 3; -const VideoConfMessageUserStack = ({ users }: { users: Serialized[] }): ReactElement => { +type VideoConfMessageUserStackProps = { + users: Serialized[]; +}; + +const VideoConfMessageUserStack = ({ users }: VideoConfMessageUserStackProps): ReactElement => { + const displayAvatars = useUserPreference('displayAvatars'); + const showRealName = useSetting('UI_Use_Real_Name'); const getUserAvatarPath = useUserAvatarPath(); return ( - - {users.slice(0, MAX_USERS).map(({ username }, index) => ( - - - - ))} - + {displayAvatars && ( + + {users.slice(0, MAX_USERS).map(({ name, username }, index) => ( + + + + ))} + + )} + {!displayAvatars && } ); }; diff --git a/packages/ui-video-conf/src/VideoConfMessage/__snapshots__/VideoConfMessage.spec.tsx.snap b/packages/ui-video-conf/src/VideoConfMessage/__snapshots__/VideoConfMessage.spec.tsx.snap index 1d513b1350757..da3506ed9d598 100644 --- a/packages/ui-video-conf/src/VideoConfMessage/__snapshots__/VideoConfMessage.spec.tsx.snap +++ b/packages/ui-video-conf/src/VideoConfMessage/__snapshots__/VideoConfMessage.spec.tsx.snap @@ -147,54 +147,17 @@ exports[`renders CallEnded without crashing 1`] = `
- +  +

- Joined + joined

@@ -362,7 +325,7 @@ exports[`renders CallEndedDM without crashing 1`] = `

Call was not answered

@@ -534,54 +497,17 @@ exports[`renders CallOngoing without crashing 1`] = `
- +  +

- Joined + joined

@@ -749,7 +675,7 @@ exports[`renders CallingDM without crashing 1`] = `

Waiting for answer

@@ -884,3 +810,184 @@ exports[`renders Loading without crashing 1`] = ` `; + +exports[`renders NoAvatars without crashing 1`] = ` + +
+
+ + +`;