felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-04 23:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into gil/5230_SP2-Adding_Rooms_to_Spaces

Browse Source 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift
#	Riot/Modules/Spaces/SpaceRoomList/ExploreRoom/SpaceExploreRoomViewController.swift
#	Riot/SupportingFiles/Riot-Bridging-Header.h
#	RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
This commit is contained in:
Gil Eluard
2022-01-17 20:40:12 +01:00
parent cfd00fea40 3ea9de7c53
commit 044367bda5
394 changed files with 9646 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/SideMenu/SideMenuCoordinator.swift
+2 -2
View File
@@ -395,9 +395,9 @@ extension SideMenuCoordinator: SpaceMenuPresenterDelegate {
case .addRoom:
self.showAddRoom(spaceId: spaceId, session: session)
case .addSpace:
AppDelegate.theDelegate().showAlert(withTitle: VectorL10n.spacesAddSpace, message: VectorL10n.spacesComingSoonDetail)
AppDelegate.theDelegate().showAlert(withTitle: VectorL10n.spacesAddSpace, message: VectorL10n.spacesComingSoonDetail(AppInfo.current.displayName))
case .settings:
AppDelegate.theDelegate().showAlert(withTitle: VectorL10n.sideMenuActionSettings, message: VectorL10n.spacesComingSoonDetail)
AppDelegate.theDelegate().showAlert(withTitle: VectorL10n.sideMenuActionSettings, message: VectorL10n.spacesComingSoonDetail(AppInfo.current.displayName))
}
}
}