From bcd285e3685e5600d2641f7606c136065b1d1b81 Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Tue, 17 Sep 2024 12:52:59 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F(frontend)=20refactor=20toolt?= =?UTF-8?q?ip=20on=20screen=20share=20toggle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reorganize tooltip to follow others toggle buttons. --- .../rooms/livekit/components/controls/ScreenShareToggle.tsx | 5 +++-- src/frontend/src/locales/de/rooms.json | 4 ++++ src/frontend/src/locales/en/rooms.json | 6 ++++-- src/frontend/src/locales/fr/rooms.json | 6 ++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/frontend/src/features/rooms/livekit/components/controls/ScreenShareToggle.tsx b/src/frontend/src/features/rooms/livekit/components/controls/ScreenShareToggle.tsx index f66b4838..c451e210 100644 --- a/src/frontend/src/features/rooms/livekit/components/controls/ScreenShareToggle.tsx +++ b/src/frontend/src/features/rooms/livekit/components/controls/ScreenShareToggle.tsx @@ -11,13 +11,14 @@ export const ScreenShareToggle = ( 'source' | 'captureOptions' > ) => { - const { t } = useTranslation('rooms', { keyPrefix: 'controls' }) + const { t } = useTranslation('rooms', { keyPrefix: 'controls.screenShare' }) const { buttonProps, enabled } = useTrackToggle({ ...props, source: Track.Source.ScreenShare, captureOptions: { audio: true, selfBrowserSurface: 'include' }, }) + const tooltipLabel = enabled ? 'stop' : 'start' const Icon = enabled ? RiCloseFill : RiArrowUpLine // fixme - remove ToggleButton custom styles when we design a proper icon @@ -26,7 +27,7 @@ export const ScreenShareToggle = ( isSelected={enabled} square legacyStyle - tooltip={t(enabled ? 'stopScreenShare' : 'shareScreen')} + tooltip={t(tooltipLabel)} onPress={(e) => buttonProps.onClick?.( e as unknown as React.MouseEvent diff --git a/src/frontend/src/locales/de/rooms.json b/src/frontend/src/locales/de/rooms.json index 0c5680ab..eda86274 100644 --- a/src/frontend/src/locales/de/rooms.json +++ b/src/frontend/src/locales/de/rooms.json @@ -53,6 +53,10 @@ "raise": "", "lower": "" }, + "screenShare": { + "start": "", + "stop": "" + }, "leave": "", "participants": { "open": "", diff --git a/src/frontend/src/locales/en/rooms.json b/src/frontend/src/locales/en/rooms.json index 935429c1..eaae4617 100644 --- a/src/frontend/src/locales/en/rooms.json +++ b/src/frontend/src/locales/en/rooms.json @@ -43,8 +43,6 @@ "controls": { "microphone": "Microphone", "camera": "Camera", - "shareScreen": "Share screen", - "stopScreenShare": "Stop screen share", "chat": { "open": "Close the chat", "closed": "Open the chat" @@ -53,6 +51,10 @@ "raise": "Raise hand", "lower": "Lower hand" }, + "screenShare": { + "start": "Share screen", + "stop": "Stop screen share" + }, "leave": "Leave", "participants": { "open": "Hide everyone", diff --git a/src/frontend/src/locales/fr/rooms.json b/src/frontend/src/locales/fr/rooms.json index 94b54b98..da9747ca 100644 --- a/src/frontend/src/locales/fr/rooms.json +++ b/src/frontend/src/locales/fr/rooms.json @@ -43,8 +43,6 @@ "controls": { "microphone": "Microphone", "camera": "Camera", - "shareScreen": "Partager l'écran", - "stopScreenShare": "Arrêter le partage", "chat": { "open": "Masquer le chat", "closed": "Afficher le chat" @@ -53,6 +51,10 @@ "raise": "Lever la main", "lower": "Baisser la main" }, + "screenShare": { + "start": "Partager l'écran", + "stop": "Arrêter le partage" + }, "leave": "Quitter", "participants": { "open": "Masquer les participants",