diff --git a/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift b/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift
index d5f540167..99b74b07e 100644
--- a/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift
+++ b/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift
@@ -112,13 +112,13 @@ extension GroupedNotificationType {
if totalAuthorCount == 1 {
switch self {
case .favourite:
- plainString = firstAuthorName
+ plainString = L10n.Scene.Notification.GroupedNotificationDescription.singleNameFavourited(firstAuthorName)
case .follow:
- plainString = firstAuthorName
+ plainString = L10n.Scene.Notification.GroupedNotificationDescription.singleNameFollowedYou(firstAuthorName)
case .followRequest:
- plainString = firstAuthorName
+ plainString = L10n.Scene.Notification.GroupedNotificationDescription.singleNameRequestedToFollowYou(firstAuthorName)
case .reblog:
- plainString = firstAuthorName
+ plainString = L10n.Scene.Notification.GroupedNotificationDescription.singleNameBoosted(firstAuthorName)
case .mention:
plainString = firstAuthorName
case .poll(let status):
@@ -128,21 +128,20 @@ extension GroupedNotificationType {
case .status:
plainString = firstAuthorName
case .adminSignUp:
- plainString = firstAuthorName
+ plainString = L10n.Scene.Notification.GroupedNotificationDescription.singleNameSignedUp(firstAuthorName)
default:
plainString = firstAuthorName
}
} else {
- let actorsList = sourceAccounts.authorsDescription ?? firstAuthorName
switch self {
case .favourite:
- plainString = actorsList
+ plainString = L10n.Plural.Count.peopleFavourited(totalAuthorCount)
case .follow:
- plainString = actorsList
+ plainString = L10n.Plural.Count.peopleFollowedYou(totalAuthorCount)
case .reblog:
- plainString = actorsList
+ plainString = L10n.Plural.Count.peopleBoosted(totalAuthorCount)
default:
- plainString = actorsList
+ 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 483719eba..5d7310849 100644
--- a/Mastodon/In Progress New Layout and Datamodel/NotificationRowViewModel.swift
+++ b/Mastodon/In Progress New Layout and Datamodel/NotificationRowViewModel.swift
@@ -237,29 +237,7 @@ class NotificationRowViewModel: ObservableObject {
case (false, true):
return (iconName: "at", text: L10n.Common.Controls.Status.privateMention, color: color)
}
- case .adminReport:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.report, color: color)
- case .adminSignUp:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.signUp, color: color)
- case .favourite:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.favourite, color: color)
- case .follow:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.follow, color: color)
- case .followRequest:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.followRequest, color: color)
- case .moderationWarning:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.moderationWarning, color: .red)
- case .poll:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.poll, color: color)
- case .reblog:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.boost, color: color)
- case .severedRelationships:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.severedRelationships, color: color)
- case .status:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.status, color: color)
- case .update:
- return (iconName: nil, text: L10n.Scene.Notification.Headers.edit, color: color)
- case ._other:
+ default:
return nil
}
}
diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
index 0f8a4d2a4..a77060b7f 100644
--- a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
+++ b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
@@ -2115,6 +2115,18 @@ public enum L10n {
public static func others(_ p1: Int) -> String {
return L10n.tr("Localizable", "plural.count.others", p1, fallback: "Plural format key: \"%#@count_others@\"")
}
+ /// Plural format key: "%#@count_people@"
+ public static func peopleBoosted(_ p1: Int) -> String {
+ return L10n.tr("Localizable", "plural.count.people_boosted", p1, fallback: "Plural format key: \"%#@count_people@\"")
+ }
+ /// Plural format key: "%#@count_people@"
+ public static func peopleFavourited(_ p1: Int) -> String {
+ return L10n.tr("Localizable", "plural.count.people_favourited", p1, fallback: "Plural format key: \"%#@count_people@\"")
+ }
+ /// Plural format key: "%#@count_people@"
+ public static func peopleFollowedYou(_ p1: Int) -> String {
+ return L10n.tr("Localizable", "plural.count.people_followed_you", p1, fallback: "Plural format key: \"%#@count_people@\"")
+ }
/// Plural format key: "%#@poll_count@"
public static func poll(_ p1: Int) -> String {
return L10n.tr("Localizable", "plural.count.poll", p1, fallback: "Plural format key: \"%#@poll_count@\"")
diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict
index 5b38104cd..8d06852bc 100644
--- a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict
+++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict
@@ -143,6 +143,66 @@
%ld others
+ plural.count.people_boosted
+
+ NSStringLocalizedFormatKey
+ %#@count_people@
+ count_people
+
+ NSStringFormatSpecTypeKey
+ NSStringPluralRuleType
+ NSStringFormatValueTypeKey
+ ld
+ one
+ one person boosted:
+ few
+ %ld people boosted:
+ many
+ %ld people boosted:
+ other
+ %ld people boosted:
+
+
+ plural.count.people_favourited
+
+ NSStringLocalizedFormatKey
+ %#@count_people@
+ count_people
+
+ NSStringFormatSpecTypeKey
+ NSStringPluralRuleType
+ NSStringFormatValueTypeKey
+ ld
+ one
+ one person favourited:
+ few
+ %ld people favourited:
+ many
+ %ld people favourited:
+ other
+ %ld people favourited:
+
+
+ plural.count.people_followed_you
+
+ NSStringLocalizedFormatKey
+ %#@count_people@
+ count_people
+
+ NSStringFormatSpecTypeKey
+ NSStringPluralRuleType
+ NSStringFormatValueTypeKey
+ ld
+ one
+ one person followed you
+ few
+ %ld people followed you
+ many
+ %ld people followed you
+ other
+ %ld people followed you
+
+
plural.count.poll_that_you_and_others_voted_in
NSStringLocalizedFormatKey
diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict
index c702d491c..64e1bf241 100644
--- a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict
+++ b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict
@@ -109,6 +109,66 @@
%ld others
+ plural.count.people_boosted
+
+ NSStringLocalizedFormatKey
+ %#@count_people@
+ count_people
+
+ NSStringFormatSpecTypeKey
+ NSStringPluralRuleType
+ NSStringFormatValueTypeKey
+ ld
+ one
+ one person boosted:
+ few
+ %ld people boosted:
+ many
+ %ld people boosted:
+ other
+ %ld people boosted:
+
+
+ plural.count.people_favourited
+
+ NSStringLocalizedFormatKey
+ %#@count_people@
+ count_people
+
+ NSStringFormatSpecTypeKey
+ NSStringPluralRuleType
+ NSStringFormatValueTypeKey
+ ld
+ one
+ one person favourited:
+ few
+ %ld people favourited:
+ many
+ %ld people favourited:
+ other
+ %ld people favourited:
+
+
+ plural.count.people_followed_you
+
+ NSStringLocalizedFormatKey
+ %#@count_people@
+ count_people
+
+ NSStringFormatSpecTypeKey
+ NSStringPluralRuleType
+ NSStringFormatValueTypeKey
+ ld
+ one
+ one person followed you
+ few
+ %ld people followed you
+ many
+ %ld people followed you
+ other
+ %ld people followed you
+
+
plural.count.poll_that_you_and_others_voted_in
NSStringLocalizedFormatKey