Compare commits

...

3 Commits

Author SHA1 Message Date
Jonas 7f834dd6a0
Merge 093e286e0f into b60d1e77a6 2024-11-28 14:09:58 +01:00
Nextcloud bot b60d1e77a6
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-11-28 02:33:16 +00:00
brtbr 093e286e0f fix: add new hide_presentation_on_join flag
As of BBB 2.6 the userdata flag for hiding the presentation has changed. This commit adds the new `bbb_hide_presentation_on_join` flag when a clean layout is selected.

In order to keep backwards compatability for BBB 2.5 and lower we can
send both flags and remove the deprecated one later on.
2024-06-02 18:16:54 +02:00
3 changed files with 12 additions and 1 deletions

View File

@ -1,6 +1,10 @@
OC.L10N.register( OC.L10N.register(
"bbb", "bbb",
{ {
"You shared the room %s with {shareWith}." : "Du delade rummet %s med {shareWith}.",
"{user} shared the room %s with you." : "{user} delade rummet %s med dig.",
"You unshared the room %s with {shareWith}." : "Du slutade dela rummet %s med {shareWith}.",
"{user} unshared the room %s with you." : "{user} slutade dela rummet %s med dig.",
"Public" : "Offentlig", "Public" : "Offentlig",
"Internal" : "Intern", "Internal" : "Intern",
"Back to %s" : "Tillbaka till %s", "Back to %s" : "Tillbaka till %s",
@ -35,6 +39,7 @@ OC.L10N.register(
"Server error" : "Serverfel", "Server error" : "Serverfel",
"Start" : "Start", "Start" : "Start",
"Loading" : "Läser in", "Loading" : "Läser in",
"You are not allowed to change this option, because this room is shared with you." : "Du får inte ändra det här alternativet eftersom detta rum delas med dig.",
"Settings saved" : "Inställningar sparade", "Settings saved" : "Inställningar sparade",
"Unexpected error occurred" : "Ett oväntat fel inträffade", "Unexpected error occurred" : "Ett oväntat fel inträffade",
"Send to" : "Skicka till", "Send to" : "Skicka till",

View File

@ -1,4 +1,8 @@
{ "translations": { { "translations": {
"You shared the room %s with {shareWith}." : "Du delade rummet %s med {shareWith}.",
"{user} shared the room %s with you." : "{user} delade rummet %s med dig.",
"You unshared the room %s with {shareWith}." : "Du slutade dela rummet %s med {shareWith}.",
"{user} unshared the room %s with you." : "{user} slutade dela rummet %s med dig.",
"Public" : "Offentlig", "Public" : "Offentlig",
"Internal" : "Intern", "Internal" : "Intern",
"Back to %s" : "Tillbaka till %s", "Back to %s" : "Tillbaka till %s",
@ -33,6 +37,7 @@
"Server error" : "Serverfel", "Server error" : "Serverfel",
"Start" : "Start", "Start" : "Start",
"Loading" : "Läser in", "Loading" : "Läser in",
"You are not allowed to change this option, because this room is shared with you." : "Du får inte ändra det här alternativet eftersom detta rum delas med dig.",
"Settings saved" : "Inställningar sparade", "Settings saved" : "Inställningar sparade",
"Unexpected error occurred" : "Ett oväntat fel inträffade", "Unexpected error occurred" : "Ett oväntat fel inträffade",
"Send to" : "Skicka till", "Send to" : "Skicka till",

View File

@ -118,7 +118,8 @@ class API {
$joinMeetingParams->addUserData('bbb_skip_video_preview_on_first_join', !$room->getMediaCheck()); // 2.3 $joinMeetingParams->addUserData('bbb_skip_video_preview_on_first_join', !$room->getMediaCheck()); // 2.3
if ($room->getCleanLayout()) { if ($room->getCleanLayout()) {
$joinMeetingParams->addUserData('bbb_auto_swap_layout', true); $joinMeetingParams->addUserData('bbb_auto_swap_layout', true); // 2.5 and below // ToDo: remove in the future
$joinMeetingParams->addUserData('bbb_hide_presentation_on_join', true); // 2.6 and up
$joinMeetingParams->addUserData('bbb_show_participants_on_login', false); $joinMeetingParams->addUserData('bbb_show_participants_on_login', false);
$joinMeetingParams->addUserData('bbb_show_public_chat_on_login', false); $joinMeetingParams->addUserData('bbb_show_public_chat_on_login', false);
} }