Skip to content

fix: Leave room confirmation modal not displaying room name #35568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 5 commits into from
Mar 21, 2025
Merged

fix: Leave room confirmation modal not displaying room name #35568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3bbb835
fix translation strings
gabriellsh Mar 20, 2025
f60f014
Fix translation usage
gabriellsh Mar 20, 2025
efcae31
fix livechat message
gabriellsh Mar 20, 2025
c6f772c
Add changeset
gabriellsh Mar 20, 2025
146eeb2
Merge remote-tracking branch 'origin/develop' into fix/leaveHideTrans…
MartinSchoeler Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/gorgeous-turtles-flow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/i18n": patch
---

Fixes an issue with the leave room confirmation modal not displaying the room's name.
2 changes: 1 addition & 1 deletion apps/meteor/client/hooks/menuActions/useLeaveRoom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const useLeaveRoomAction = ({ rid, type, name, roomOpen }: LeaveRoomProps

setModal(
<WarningModal
text={t(warnText as TranslationKey, name)}
text={t(warnText as TranslationKey, { roomName: name })}
confirmText={t('Leave_room')}
close={() => setModal(null)}
cancelText={t('Cancel')}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/hooks/useHideRoomAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const useHideRoomAction = ({ rid: roomId, type, name }: HideRoomProps, {
label: t('Hide_room'),
}}
>
{t(warnText as TranslationKey, { postProcess: 'sprintf', sprintf: [name] })}
{t(warnText as TranslationKey, { roomName: name })}
</GenericModalDoNotAskAgain>,
);
});
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/lib/rooms/roomTypes/livechat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ roomCoordinator.add(
case UiTextContext.HIDE_WARNING:
return 'Hide_Livechat_Warning';
case UiTextContext.LEAVE_WARNING:
return 'Hide_Livechat_Warning';
return 'Leave_Livechat_Warning';
default:
return '';
}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/contextualBar/Info/hooks/actions/useRoomLeave.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const useRoomLeave = (room: IRoom, joined = true) => {

setModal(
<WarningModal
text={t(warnText as TranslationKey, room.fname || room.name)}
text={t(warnText as TranslationKey, { roomName: room.fname || room.name })}
confirmText={t('Leave_room')}
close={() => setModal(null)}
cancelText={t('Cancel')}
Expand Down
16 changes: 8 additions & 8 deletions packages/i18n/src/locales/af.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,12 +1218,12 @@
"Hide": "Versteek kamer",
"Hide_counter": "Versteek toonbank",
"Hide_flextab": "Versteek regterkantste zijbalk met klik",
"Hide_Group_Warning": "Is jy seker jy wil die groep \"%s\" versteek?",
"Hide_Livechat_Warning": "Is jy seker jy wil die livechat verberg met \"%s\"?",
"Hide_Private_Warning": "Is jy seker jy wil die bespreking met \"%s\" versteek?",
"Hide_Group_Warning": "Is jy seker jy wil die groep \"{{roomName}}\" versteek?",
"Hide_Livechat_Warning": "Is jy seker jy wil die livechat verberg met \"{{roomName}}\"?",
"Hide_Private_Warning": "Is jy seker jy wil die bespreking met \"{{roomName}}\" versteek?",
"Hide_roles": "Versteek rolle",
"Hide_room": "Versteek kamer",
"Hide_Room_Warning": "Is jy seker jy wil die kamer \"%s\" versteek?",
"Hide_Room_Warning": "Is jy seker jy wil die kamer \"{{roomName}}\" versteek?",
"Hide_Unread_Room_Status": "Versteek Ongelees Kamer Status",
"Hide_usernames": "Versteek gebruikersname",
"Highlights": "hoogtepunte",
Expand Down Expand Up @@ -1523,11 +1523,11 @@
"Lead_capture_email_regex": "Lei vang e-pos regex",
"Lead_capture_phone_regex": "Lead capture phone regex",
"Leave": "Los kamer",
"Leave_Group_Warning": "Is jy seker jy wil die groep \"%s\" verlaat?",
"Leave_Livechat_Warning": "Is jy seker jy wil die livechat met \"%s\" verlaat?",
"Leave_Private_Warning": "Is jy seker jy wil die gesprek met \"%s\" verlaat?",
"Leave_Group_Warning": "Is jy seker jy wil die groep \"{{roomName}}\" verlaat?",
"Leave_Livechat_Warning": "Is jy seker jy wil die livechat met \"{{roomName}}\" verlaat?",
"Leave_Private_Warning": "Is jy seker jy wil die gesprek met \"{{roomName}}\" verlaat?",
"Leave_room": "Los kamer",
"Leave_Room_Warning": "Is jy seker jy wil die kamer \"%s\" verlaat?",
"Leave_Room_Warning": "Is jy seker jy wil die kamer \"{{roomName}}\" verlaat?",
"Leave_the_current_channel": "Los die huidige kanaal",
"leave-c": "Laat kanale",
"leave-p": "Verlaat privaat groepe",
Expand Down
18 changes: 9 additions & 9 deletions packages/i18n/src/locales/ar.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1744,10 +1744,10 @@
"Hi_username": "مرحبًا [name]",
"Hidden": "مخفي",
"Hide": "إخفاء",
"Hide_Group_Warning": "هل تريد فعلاً إخفاء المجموعة \"‎%s\"؟",
"Hide_Livechat_Warning": "هل تريد فعلاً إخفاء الدردشة مع \"‎%s\"؟",
"Hide_Private_Warning": "هل تريد فعلاً إخفاء المناقشة مع \"‎%s\"؟",
"Hide_Room_Warning": "هل تريد فعلاً إخفاء القناة \"‎%s\"؟",
"Hide_Group_Warning": "هل تريد فعلاً إخفاء المجموعة \"‎{{roomName}}\"؟",
"Hide_Livechat_Warning": "هل تريد فعلاً إخفاء الدردشة مع \"‎{{roomName}}\"؟",
"Hide_Private_Warning": "هل تريد فعلاً إخفاء المناقشة مع \"‎{{roomName}}\"؟",
"Hide_Room_Warning": "هل تريد فعلاً إخفاء القناة \"‎{{roomName}}\"؟",
"Hide_System_Messages": "إخفاء رسائل النظام",
"Hide_Unread_Room_Status": "إخفاء حالة Room غير المقروءة",
"Hide_counter": "إخفاء العداد",
Expand Down Expand Up @@ -2215,10 +2215,10 @@
"Lead_capture_phone_regex": "التعبير النمطي للهاتف المحمول لالتقاط العملاء المتوقعين",
"Least_recent_updated": "آخر تحديث",
"Leave": "مغادرة أو ترك",
"Leave_Group_Warning": "هل تريد فعلاً مغادرة المجموعة \"%s\"؟",
"Leave_Livechat_Warning": "هل تريد فعلاً مغادرة القناة متعددة الاتجاهات مع \" %s\"؟",
"Leave_Private_Warning": "هل تريد فعلاً مغادرة المناقشة مع \"%s\"؟",
"Leave_Room_Warning": "هل تريد فعلاً مغادرة القناة \"%s\"؟",
"Leave_Group_Warning": "هل تريد فعلاً مغادرة المجموعة \"{{roomName}}\"؟",
"Leave_Livechat_Warning": "هل تريد فعلاً مغادرة القناة متعددة الاتجاهات مع \" {{roomName}}\"؟",
"Leave_Private_Warning": "هل تريد فعلاً مغادرة المناقشة مع \"{{roomName}}\"؟",
"Leave_Room_Warning": "هل تريد فعلاً مغادرة القناة \"{{roomName}}\"؟",
"Leave_a_comment": "ترك تعليق",
"Leave_room": "مغادرة",
"Leave_the_current_channel": "مغادرة القناة الحالية",
Expand Down Expand Up @@ -4873,4 +4873,4 @@
"you_are_in_preview_mode_of_incoming_livechat": "أنت في وضع المعاينة لهذه الدردشة",
"your_message": "رسالتك",
"your_message_optional": "رسالتك (اختياري)"
}
}
16 changes: 8 additions & 8 deletions packages/i18n/src/locales/az.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,12 +1218,12 @@
"Hide": "Otaqları gizlədin",
"Hide_counter": "Saytı gizlət",
"Hide_flextab": "Sağ Kenar Çubuğunu Kliklə Gizlət",
"Hide_Group_Warning": "\"%s\" qrupunu gizlətmək istədiyinizə əminsiniz?",
"Hide_Livechat_Warning": "Livechat'ı \"%s\" ilə gizlətmək istədiyinizə əminsiniz?",
"Hide_Private_Warning": "Müzakirə \"%s\" ilə gizlətmək istədiyinizə əminsiniz?",
"Hide_Group_Warning": "\"{{roomName}}\" qrupunu gizlətmək istədiyinizə əminsiniz?",
"Hide_Livechat_Warning": "Livechat'ı \"{{roomName}}\" ilə gizlətmək istədiyinizə əminsiniz?",
"Hide_Private_Warning": "Müzakirə \"{{roomName}}\" ilə gizlətmək istədiyinizə əminsiniz?",
"Hide_roles": "Roles gizlət",
"Hide_room": "Otaqları gizlədin",
"Hide_Room_Warning": "\"%s\" otağını gizlətmək istədiyinizə əminsiniz?",
"Hide_Room_Warning": "\"{{roomName}}\" otağını gizlətmək istədiyinizə əminsiniz?",
"Hide_Unread_Room_Status": "Oxunmamış Otaq Statusını Gizlət",
"Hide_usernames": "İstifadəçi adlarını gizlət",
"Highlights": "Zirvələr",
Expand Down Expand Up @@ -1523,11 +1523,11 @@
"Lead_capture_email_regex": "Nəzarət ələ e-poçt qeydiyyatdan keçirin",
"Lead_capture_phone_regex": "Nəzarət aparan telefon regex",
"Leave": "Otaq buraxın",
"Leave_Group_Warning": "\"%s\" qrupunu tərk etmək istədiyinizə əminsiniz?",
"Leave_Livechat_Warning": "Livechat'ı \"%s\" ilə tərk etmək istədiyinizə əminsiniz?",
"Leave_Private_Warning": "Müzakirə \"%s\" ilə tərk etmək istədiyinizə əminsiniz?",
"Leave_Group_Warning": "\"{{roomName}}\" qrupunu tərk etmək istədiyinizə əminsiniz?",
"Leave_Livechat_Warning": "Livechat'ı \"{{roomName}}\" ilə tərk etmək istədiyinizə əminsiniz?",
"Leave_Private_Warning": "Müzakirə \"{{roomName}}\" ilə tərk etmək istədiyinizə əminsiniz?",
"Leave_room": "Otaq buraxın",
"Leave_Room_Warning": "\"%s\" otağından çıxmaq istəyirsiniz?",
"Leave_Room_Warning": "\"{{roomName}}\" otağından çıxmaq istəyirsiniz?",
"Leave_the_current_channel": "Cari kanalı buraxın",
"leave-c": "Kanallardan çıxın",
"leave-p": "Şəxsi Qruplar buraxın",
Expand Down
16 changes: 8 additions & 8 deletions packages/i18n/src/locales/be-BY.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,12 +1234,12 @@
"Hide": "схаваць нумар",
"Hide_counter": "схаваць лічыльнік",
"Hide_flextab": "Схаваць правую бакавую панэль з шчылінкі",
"Hide_Group_Warning": "Вы ўпэўненыя, што хочаце схаваць групу «%s\"?",
"Hide_Livechat_Warning": "Вы ўпэўненыя, што хочаце схаваць звязаўшыся \"%s\"?",
"Hide_Private_Warning": "Вы ўпэўненыя, што хочаце схаваць дыскусію з \"%s\"?",
"Hide_Group_Warning": "Вы ўпэўненыя, што хочаце схаваць групу «{{roomName}}\"?",
"Hide_Livechat_Warning": "Вы ўпэўненыя, што хочаце схаваць звязаўшыся \"{{roomName}}\"?",
"Hide_Private_Warning": "Вы ўпэўненыя, што хочаце схаваць дыскусію з \"{{roomName}}\"?",
"Hide_roles": "схаваць ролі",
"Hide_room": "схаваць нумар",
"Hide_Room_Warning": "Вы ўпэўненыя, што хочаце схаваць нумар \"%s\"?",
"Hide_Room_Warning": "Вы ўпэўненыя, што хочаце схаваць нумар \"{{roomName}}\"?",
"Hide_Unread_Room_Status": "Схаваць Статус непрачытаных нумары",
"Hide_usernames": "Схаваць імёны карыстальнікаў",
"Highlights": "мелірованіе",
Expand Down Expand Up @@ -1539,11 +1539,11 @@
"Lead_capture_email_regex": "Свінец захопу электроннай пошты рэгулярных выразаў",
"Lead_capture_phone_regex": "Свінец захопу тэлефона рэгулярны выраз",
"Leave": "Пакіньце нумар",
"Leave_Group_Warning": "Вы ўпэўненыя, што жадаеце выйсці з групы \"%s\"?",
"Leave_Livechat_Warning": "Вы ўпэўненыя, што жадаеце пакінуць звязаўшыся \"%s\"?",
"Leave_Private_Warning": "Вы ўпэўненыя, што жадаеце пакінуць дыскусію з \"%s\"?",
"Leave_Group_Warning": "Вы ўпэўненыя, што жадаеце выйсці з групы \"{{roomName}}\"?",
"Leave_Livechat_Warning": "Вы ўпэўненыя, што жадаеце пакінуць звязаўшыся \"{{roomName}}\"?",
"Leave_Private_Warning": "Вы ўпэўненыя, што жадаеце пакінуць дыскусію з \"{{roomName}}\"?",
"Leave_room": "Пакіньце нумар",
"Leave_Room_Warning": "Вы ўпэўненыя, што хочаце выйсці з пакоя \"%s\"?",
"Leave_Room_Warning": "Вы ўпэўненыя, што хочаце выйсці з пакоя \"{{roomName}}\"?",
"Leave_the_current_channel": "Пакіньце бягучы канал",
"leave-c": "Пакіньце каналы",
"leave-p": "Пакіньце Прыватныя групы",
Expand Down
16 changes: 8 additions & 8 deletions packages/i18n/src/locales/bg.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,12 +1218,12 @@
"Hide": "Скрий стая",
"Hide_counter": "Скриване на брояч",
"Hide_flextab": "Скриване на дясната странична лента с кликване",
"Hide_Group_Warning": "Наистина ли искате да скриете групата \"%s\"?",
"Hide_Livechat_Warning": "Наистина ли искате да скриете livechat с \"%s\"?",
"Hide_Private_Warning": "Наистина ли искате да скриете дискусията с \"%s\"?",
"Hide_Group_Warning": "Наистина ли искате да скриете групата \"{{roomName}}\"?",
"Hide_Livechat_Warning": "Наистина ли искате да скриете livechat с \"{{roomName}}\"?",
"Hide_Private_Warning": "Наистина ли искате да скриете дискусията с \"{{roomName}}\"?",
"Hide_roles": "Скриване на роли",
"Hide_room": "Скрий стая",
"Hide_Room_Warning": "Наистина ли искате да скриете стаята \"%s\"?",
"Hide_Room_Warning": "Наистина ли искате да скриете стаята \"{{roomName}}\"?",
"Hide_Unread_Room_Status": "Скриване на състоянието на непрочетената стая",
"Hide_usernames": "Скриване на потребителските имена",
"Highlights": "Акценти",
Expand Down Expand Up @@ -1521,11 +1521,11 @@
"Lead_capture_email_regex": "Водещ имейл регекс за улавяне",
"Lead_capture_phone_regex": "Водещ телефонен регекс за улавяне",
"Leave": "Излез от стаята",
"Leave_Group_Warning": "Наистина ли искате да напуснете групата \"%s\"?",
"Leave_Livechat_Warning": "Сигурни ли сте, че искате да оставите livechat с \"%s\"?",
"Leave_Private_Warning": "Наистина ли искате да оставите дискусията с \"%s\"?",
"Leave_Group_Warning": "Наистина ли искате да напуснете групата \"{{roomName}}\"?",
"Leave_Livechat_Warning": "Сигурни ли сте, че искате да оставите livechat с \"{{roomName}}\"?",
"Leave_Private_Warning": "Наистина ли искате да оставите дискусията с \"{{roomName}}\"?",
"Leave_room": "Излез от стаята",
"Leave_Room_Warning": "Наистина ли искате да излезете от стаята \"%s\"?",
"Leave_Room_Warning": "Наистина ли искате да излезете от стаята \"{{roomName}}\"?",
"Leave_the_current_channel": "Оставете текущия канал",
"leave-c": "Оставете канали",
"leave-p": "Напускане на частни групи",
Expand Down
16 changes: 8 additions & 8 deletions packages/i18n/src/locales/bs.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,12 +1214,12 @@
"Hide": "Sakrij sobu",
"Hide_counter": "Sakrij brojač",
"Hide_flextab": "Sakrij desni izbornik klikom",
"Hide_Group_Warning": "Jeste li sigurni da želite sakriti grupu \"%s\"?",
"Hide_Livechat_Warning": "Jeste li sigurni da želite sakriti livechat s \"%s\"?",
"Hide_Private_Warning": "Jeste li sigurni da želite sakriti raspravu s \"%s\"?",
"Hide_Group_Warning": "Jeste li sigurni da želite sakriti grupu \"{{roomName}}\"?",
"Hide_Livechat_Warning": "Jeste li sigurni da želite sakriti livechat s \"{{roomName}}\"?",
"Hide_Private_Warning": "Jeste li sigurni da želite sakriti raspravu s \"{{roomName}}\"?",
"Hide_roles": "Sakrij uloge",
"Hide_room": "Sakrij sobu",
"Hide_Room_Warning": "Jeste li sigurni da želite sakriti sobu \"%s\"?",
"Hide_Room_Warning": "Jeste li sigurni da želite sakriti sobu \"{{roomName}}\"?",
"Hide_Unread_Room_Status": "Sakrij status nepročitane sobe",
"Hide_usernames": "Sakrij korisnička imena",
"Highlights": "Istaknuto",
Expand Down Expand Up @@ -1519,11 +1519,11 @@
"Lead_capture_email_regex": "Olovo za hvatanje e-pošte regex",
"Lead_capture_phone_regex": "Olovo za hvatanje regex telefona",
"Leave": "Izađi iz sobe",
"Leave_Group_Warning": "Jeste li sigurni da želite napustiti grupu \"%s\"?",
"Leave_Livechat_Warning": "Jeste li sigurni da želite napustiti livechat s \"%s\"?",
"Leave_Private_Warning": "Jeste li sigurni da želite napustiti razgovor s \"%s\"?",
"Leave_Group_Warning": "Jeste li sigurni da želite napustiti grupu \"{{roomName}}\"?",
"Leave_Livechat_Warning": "Jeste li sigurni da želite napustiti livechat s \"{{roomName}}\"?",
"Leave_Private_Warning": "Jeste li sigurni da želite napustiti razgovor s \"{{roomName}}\"?",
"Leave_room": "Izađi iz sobe",
"Leave_Room_Warning": "Jeste li sigurni da želite izaći iz sobe \"%s\"?",
"Leave_Room_Warning": "Jeste li sigurni da želite izaći iz sobe \"{{roomName}}\"?",
"Leave_the_current_channel": "Napusti trenutnu sobu",
"leave-c": "Ostavite kanale",
"leave-p": "Napusti privatne grupe",
Expand Down
18 changes: 9 additions & 9 deletions packages/i18n/src/locales/ca.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,10 +1724,10 @@
"Hi_username": "Hola [name]",
"Hidden": "Ocult",
"Hide": "Amagar",
"Hide_Group_Warning": "Segur que voleu ocultar el grup \"%s\"?",
"Hide_Livechat_Warning": "Estàs segur que vols amagar al xat amb \"%s\"?",
"Hide_Private_Warning": "Segur que voleu ocultar la discussió amb \"%s\"?",
"Hide_Room_Warning": "Segur que vols amagar la sala amb \"%s\"?",
"Hide_Group_Warning": "Segur que voleu ocultar el grup \"{{roomName}}\"?",
"Hide_Livechat_Warning": "Estàs segur que vols amagar al xat amb \"{{roomName}}\"?",
"Hide_Private_Warning": "Segur que voleu ocultar la discussió amb \"{{roomName}}\"?",
"Hide_Room_Warning": "Segur que vols amagar la sala amb \"{{roomName}}\"?",
"Hide_System_Messages": "Ocultar els missatges del sistema",
"Hide_Unread_Room_Status": "Amaga l'estat de sales no llegides",
"Hide_counter": "Amaga comptador",
Expand Down Expand Up @@ -2193,10 +2193,10 @@
"Lead_capture_phone_regex": "Regex de telèfon de captura clients potencials",
"Least_recent_updated": "Actualització menys recent",
"Leave": "Sortir ",
"Leave_Group_Warning": "Segur que vols deixar el grup \"%s\"?",
"Leave_Livechat_Warning": "Segur que vols sortir de l'LiveChat amb \"%s\"?",
"Leave_Private_Warning": "Segur que vols sortir de la conversa amb \"%s\"?",
"Leave_Room_Warning": "Segur que vols sortir de la sala \"%s\"?",
"Leave_Group_Warning": "Segur que vols deixar el grup \"{{roomName}}\"?",
"Leave_Livechat_Warning": "Segur que vols sortir de l'LiveChat amb \"{{roomName}}\"?",
"Leave_Private_Warning": "Segur que vols sortir de la conversa amb \"{{roomName}}\"?",
"Leave_Room_Warning": "Segur que vols sortir de la sala \"{{roomName}}\"?",
"Leave_a_comment": "Deixar un comentari",
"Leave_room": "Sortir ",
"Leave_the_current_channel": "Surt del canal actual",
Expand Down Expand Up @@ -4676,4 +4676,4 @@
"you_are_in_preview_mode_of_incoming_livechat": "Esteu en mode de previsualització d'aquest xat",
"your_message": "El seu missatge",
"your_message_optional": "el seu missatge (opcional)"
}
}
Loading
Loading