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

Merge branch 'gil/5225_invite_to_space_in_room_landing' into gil/5224_space_creation

Browse Source 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
This commit is contained in:
Gil Eluard
2021-12-14 11:00:02 +01:00
parent edb40a553a
commit d9a75c1928
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Generated/Images.swift
+1 -2
View File
@@ -198,13 +198,12 @@ internal enum Asset {
internal static let sideMenuNotifIcon = ImageAsset(name: "side_menu_notif_icon")
internal static let featureUnavaibleArtwork = ImageAsset(name: "feature_unavaible_artwork")
internal static let featureUnavaibleArtworkDark = ImageAsset(name: "feature_unavaible_artwork_dark")
internal static let spaceAddRoom = ImageAsset(name: "space_add_room")
internal static let spaceCreationCamera = ImageAsset(name: "space_creation_camera")
internal static let spaceCreationPrivate = ImageAsset(name: "space_creation_private")
internal static let spaceCreationPublic = ImageAsset(name: "space_creation_public")
internal static let spaceHomeIconDark = ImageAsset(name: "space_home_icon_dark")
internal static let spaceHomeIconLight = ImageAsset(name: "space_home_icon_light")
internal static let spaceAddRoom = ImageAsset(name: "space_add_room")
internal static let spaceHomeIcon = ImageAsset(name: "space_home_icon")
internal static let spaceInviteUser = ImageAsset(name: "space_invite_user")
internal static let spaceMenuClose = ImageAsset(name: "space_menu_close")
internal static let spaceMenuLeave = ImageAsset(name: "space_menu_leave")
Riot/Generated/Strings.swift
+5 -3
View File
@@ -5106,6 +5106,7 @@ public class VectorL10n: NSObject {
/// description
public static var spaceTopic: String {
return VectorL10n.tr("Vector", "space_topic")
}
/// Add room
public static var spacesAddRoom: String {
return VectorL10n.tr("Vector", "spaces_add_room")
@@ -5114,13 +5115,14 @@ public class VectorL10n: NSObject {
public static var spacesAddRoomsComingSoonTitle: String {
return VectorL10n.tr("Vector", "spaces_add_rooms_coming_soon_title")
}
/// Create space
public static var spacesAddSpaceTitle: String {
return VectorL10n.tr("Vector", "spaces_add_space_title")
/// Add space
public static var spacesAddSpace: String {
return VectorL10n.tr("Vector", "spaces_add_space")
}
/// Create space
public static var spacesAddSpaceTitle: String {
return VectorL10n.tr("Vector", "spaces_add_space_title")
}
/// This feature hasn’t been implemented here, but it’s on the way. For now, you can do that with Element on your computer.
public static var spacesComingSoonDetail: String {
return VectorL10n.tr("Vector", "spaces_coming_soon_detail")