Update strings, fix missing symbol.

This commit is contained in:
Doug 2022-01-27 16:43:47 +00:00 committed by Doug
parent 26e30bedf7
commit 43fb085521
3 changed files with 66 additions and 7 deletions

View file

@ -1725,6 +1725,16 @@ Tap the + to start adding people.";
"home_empty_view_title" = "Welcome to %@,\n%@";
"home_empty_view_information" = "The all-in-one secure chat app for teams, friends and organisations. Tap the + button below to add people and rooms.";
"home_context_menu_make_dm" = "Move to People";
"home_context_menu_make_room" = "Move to Rooms";
"home_context_menu_notifications" = "Notifications";
"home_context_menu_mute" = "Mute";
"home_context_menu_unmute" = "Unmute";
"home_context_menu_favourite" = "Favourite";
"home_context_menu_unfavourite" = "Remove from Favourites";
"home_context_menu_low_priority" = "Low priority";
"home_context_menu_normal_priority" = "Normal priority";
"home_context_menu_leave" = "Leave";
// MARK: - Favourites

View file

@ -1599,6 +1599,46 @@ public class VectorL10n: NSObject {
public static var groupSection: String {
return VectorL10n.tr("Vector", "group_section")
}
/// Favourite
public static var homeContextMenuFavourite: String {
return VectorL10n.tr("Vector", "home_context_menu_favourite")
}
/// Leave
public static var homeContextMenuLeave: String {
return VectorL10n.tr("Vector", "home_context_menu_leave")
}
/// Low priority
public static var homeContextMenuLowPriority: String {
return VectorL10n.tr("Vector", "home_context_menu_low_priority")
}
/// Move to People
public static var homeContextMenuMakeDm: String {
return VectorL10n.tr("Vector", "home_context_menu_make_dm")
}
/// Move to Rooms
public static var homeContextMenuMakeRoom: String {
return VectorL10n.tr("Vector", "home_context_menu_make_room")
}
/// Mute
public static var homeContextMenuMute: String {
return VectorL10n.tr("Vector", "home_context_menu_mute")
}
/// Normal priority
public static var homeContextMenuNormalPriority: String {
return VectorL10n.tr("Vector", "home_context_menu_normal_priority")
}
/// Notifications
public static var homeContextMenuNotifications: String {
return VectorL10n.tr("Vector", "home_context_menu_notifications")
}
/// Remove from Favourites
public static var homeContextMenuUnfavourite: String {
return VectorL10n.tr("Vector", "home_context_menu_unfavourite")
}
/// Unmute
public static var homeContextMenuUnmute: String {
return VectorL10n.tr("Vector", "home_context_menu_unmute")
}
/// The all-in-one secure chat app for teams, friends and organisations. Tap the + button below to add people and rooms.
public static var homeEmptyViewInformation: String {
return VectorL10n.tr("Vector", "home_empty_view_information")

View file

@ -684,7 +684,7 @@
MXWeakify(self);
BOOL isDirect = room.isDirect;
UIAction *directChatAction = [UIAction actionWithTitle:isDirect ? @"Room" : @"Direct Chat"
UIAction *directChatAction = [UIAction actionWithTitle:isDirect ? VectorL10n.homeContextMenuMakeRoom : VectorL10n.homeContextMenuMakeDm
image:[UIImage systemImageNamed:isDirect ? @"person.crop.circle.badge.xmark" : @"person.circle"]
identifier:nil
handler:^(__kindof UIAction * _Nonnull action) {
@ -697,12 +697,12 @@
NSString *notificationsTitle;
if ([BuildSettings showNotificationsV2])
{
notificationsTitle = @"Notifications";
notificationsTitle = VectorL10n.homeContextMenuNotifications;
notificationsImage = [UIImage systemImageNamed:@"bell"];
}
else
{
notificationsTitle = isMuted ? @"Un-mute" : @"Mute";
notificationsTitle = isMuted ? VectorL10n.homeContextMenuUnmute : VectorL10n.homeContextMenuMute;
notificationsImage = [UIImage systemImageNamed:isMuted ? @"bell.slash": @"bell"];
}
@ -727,7 +727,7 @@
}
BOOL isFavourite = (currentTag && [kMXRoomTagFavourite isEqualToString:currentTag.name]);
UIAction *favouriteAction = [UIAction actionWithTitle:isFavourite ? @"Un-favourite" : @"Favourite"
UIAction *favouriteAction = [UIAction actionWithTitle:isFavourite ? VectorL10n.homeContextMenuUnfavourite : VectorL10n.homeContextMenuFavourite
image:[UIImage systemImageNamed:isFavourite ? @"star.slash" : @"star"]
identifier:nil
handler:^(__kindof UIAction * _Nonnull action) {
@ -737,7 +737,7 @@
BOOL isLowPriority = (currentTag && [kMXRoomTagLowPriority isEqualToString:currentTag.name]);
UIImage *lowPriorityImage = [UIImage systemImageNamed:isLowPriority ? @"arrow.up" : @"arrow.down"];
UIAction *lowPriorityAction = [UIAction actionWithTitle:isLowPriority ? @"Normal Priority" : @"Low Priority"
UIAction *lowPriorityAction = [UIAction actionWithTitle:isLowPriority ? VectorL10n.homeContextMenuNormalPriority : VectorL10n.homeContextMenuLowPriority
image:lowPriorityImage
identifier:nil
handler:^(__kindof UIAction * _Nonnull action) {
@ -745,8 +745,17 @@
[self updateRoomWithId:roomId asLowPriority:!isLowPriority];
}];
UIAction *leaveAction = [UIAction actionWithTitle:@"Leave"
image:[UIImage systemImageNamed:@"rectangle.righthalf.inset.filled.arrow.right"]
UIImage *leaveImage;
if (@available(iOS 14.0, *))
{
leaveImage = [UIImage systemImageNamed:@"rectangle.righthalf.inset.fill.arrow.right"];
}
else
{
leaveImage = [UIImage systemImageNamed:@"rectangle.xmark"];
}
UIAction *leaveAction = [UIAction actionWithTitle:VectorL10n.homeContextMenuLeave
image:leaveImage
identifier:nil
handler:^(__kindof UIAction * _Nonnull action) {
MXStrongifyAndReturnIfNil(self);