diff --git a/Localization/app.json b/Localization/app.json index c5ccde629..f48d048cd 100644 --- a/Localization/app.json +++ b/Localization/app.json @@ -765,6 +765,7 @@ "multiple_people_boosted": "%@ boosted:", "multiple_people_favourited": "%@ favorited:", "multiple_people_followed_you": "%@ followed you", + "mulitple_people_signed_up": "%@ new signups", "single_name_signed_up": "%@ signed up", "someone_reported_account_for_rule_violation": "Someone reported %@ for rule violation.", "someone_reported_posts_from_account_for_rule_violation": "Someone reported %@ from %@ for rule violation." diff --git a/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift b/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift index e375f100b..1a9c1c4f5 100644 --- a/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift +++ b/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift @@ -142,6 +142,8 @@ extension GroupedNotificationType { plainString = L10n.Plural.Count.peopleFollowedYou(totalAuthorCount) case .reblog: plainString = L10n.Plural.Count.peopleBoosted(totalAuthorCount) + case .adminSignUp: + plainString = L10n.Scene.Notification.GroupedNotificationDescription.multiplePeopleSignedUp(totalAuthorCount) default: plainString = L10n.Plural.Count.others(totalAuthorCount) } diff --git a/Mastodon/In Progress New Layout and Datamodel/NotificationRowViewModel.swift b/Mastodon/In Progress New Layout and Datamodel/NotificationRowViewModel.swift index 91ad698ec..fbebfaba5 100644 --- a/Mastodon/In Progress New Layout and Datamodel/NotificationRowViewModel.swift +++ b/Mastodon/In Progress New Layout and Datamodel/NotificationRowViewModel.swift @@ -785,10 +785,14 @@ extension NotificationRowViewModel { } else if let primaryAccount { return .profile(primaryAccount) } - case .followRequest, .adminSignUp: + case .followRequest: if let primaryAccount { return .profile(primaryAccount) } + case .adminSignUp: + if !isGrouped, let primaryAccount { + return .profile(primaryAccount) + } case .adminReport: break case .severedRelationships(_, let url): diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift index a8a249b5c..1ea692d79 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift +++ b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift @@ -972,6 +972,10 @@ public enum L10n { public static func multiplePeopleFollowedYou(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.MultiplePeopleFollowedYou", String(describing: p1), fallback: "%@ followed you") } + /// %@ new signups + public static func multiplePeopleSignedUp(_ p1: Any) -> String { + return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.MultiplePeopleSignedUp", String(describing: p1), fallback: "%@ new signups") + } /// %@ boosted: public static func singleNameBoosted(_ p1: Any) -> String { return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SingleNameBoosted", String(describing: p1), fallback: "%@ boosted:") diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings index f82b8bd4c..3d75feab5 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings @@ -345,6 +345,7 @@ Please retry in a few minutes."; "Scene.Notification.GroupedNotificationDescription.MultiplePeopleBoosted" = "%@ boosted:"; "Scene.Notification.GroupedNotificationDescription.MultiplePeopleFavourited" = "%@ favorited:"; "Scene.Notification.GroupedNotificationDescription.MultiplePeopleFollowedYou" = "%@ followed you"; +"Scene.Notification.GroupedNotificationDescription.MultiplePeopleSignedUp" = "%@ new signups"; "Scene.Notification.GroupedNotificationDescription.SingleNameBoosted" = "%@ boosted:"; "Scene.Notification.GroupedNotificationDescription.SingleNameEditedAPost" = "%@ edited a post you interacted with"; "Scene.Notification.GroupedNotificationDescription.SingleNameFavourited" = "%@ favorited:"; @@ -682,4 +683,4 @@ If you disagree with the policy for **%@**, you can go back and pick a different "Widget.MultipleFollowers.ConfigurationDescription" = "Show number of followers for multiple accounts."; "Widget.MultipleFollowers.ConfigurationDisplayName" = "Multiple followers"; "Widget.MultipleFollowers.MockUser.AccountName" = "another@follower.social"; -"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower"; \ No newline at end of file +"Widget.MultipleFollowers.MockUser.DisplayName" = "Another follower";