From d9a75c1928107fe1637a656045fc52235b13391a Mon Sep 17 00:00:00 2001 From: Gil Eluard Date: Tue, 14 Dec 2021 11:00:02 +0100 Subject: [PATCH] Merge branch 'gil/5225_invite_to_space_in_room_landing' into gil/5224_space_creation # Conflicts: # Riot/Assets/en.lproj/Vector.strings # Riot/Generated/Images.swift # Riot/Generated/Strings.swift --- Riot/Generated/Images.swift | 3 +-- Riot/Generated/Strings.swift | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Riot/Generated/Images.swift b/Riot/Generated/Images.swift index b511120ec..4862a14cb 100644 --- a/Riot/Generated/Images.swift +++ b/Riot/Generated/Images.swift @@ -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") diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index a562ed7a4..00e0710f6 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -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")