diff --git a/Localization/StringsConvertor/input/Base.lproj/app.json b/Localization/StringsConvertor/input/Base.lproj/app.json index c5ccde629..ac5edf1ac 100644 --- a/Localization/StringsConvertor/input/Base.lproj/app.json +++ b/Localization/StringsConvertor/input/Base.lproj/app.json @@ -768,6 +768,10 @@ "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." + "someone_reported_account_for_spam": "Someone reported %@ for spam.", + "someone_reported_posts_from_account_for_spam": "Someone reported %@ from %@ for spam." + "someone_reported_account": "Someone reported %@.", + "someone_reported_posts_from_account": "Someone reported %@ from %@." }, "notification_description": { "followed_you": "followed you", @@ -798,6 +802,7 @@ "suspend": "Your account has been suspended.", "learn_more": "Learn More" }, + "view_report" : "View report", "learn_more_about_server_blocks" : "Learn more about server blocks", "filtered_notification": { "title": "Filtered Notifications", diff --git a/Localization/app.json b/Localization/app.json index 51a5c0f2f..ac5edf1ac 100644 --- a/Localization/app.json +++ b/Localization/app.json @@ -765,7 +765,6 @@ "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 41c65c2d4..39a0595bf 100644 --- a/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift +++ b/Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift @@ -143,7 +143,7 @@ extension GroupedNotificationType { case .reblog: plainString = L10n.Plural.Count.peopleBoosted(totalAuthorCount) case .adminSignUp: - plainString = L10n.Scene.Notification.GroupedNotificationDescription.multiplePeopleSignedUp(totalAuthorCount) + plainString = L10n.Plural.Count.newSignups(totalAuthorCount) default: plainString = L10n.Plural.Count.others(totalAuthorCount) } diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift index 9b548d969..362d53ea2 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift +++ b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift @@ -974,10 +974,6 @@ 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:") @@ -2137,6 +2133,10 @@ public enum L10n { public static func media(_ p1: Int) -> String { return L10n.tr("Localizable", "plural.count.media", p1, fallback: "Plural format key: \"%#@media_count@\"") } + /// Plural format key: "%#@count_signups@" + public static func newSignups(_ p1: Int) -> String { + return L10n.tr("Localizable", "plural.count.new_signups", p1, fallback: "Plural format key: \"%#@count_signups@\"") + } /// Plural format key: "%#@count_of_your_followers@" public static func ofYourFollowers(_ p1: Int) -> String { return L10n.tr("Localizable", "plural.count.of_your_followers", p1, fallback: "Plural format key: \"%#@count_of_your_followers@\"") diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings index 9687f7312..f7caab3ce 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings @@ -345,7 +345,6 @@ 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:"; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict index 05211b3cf..e75c1f517 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict @@ -112,6 +112,26 @@ %ld others + plural.count.new_signups + + NSStringLocalizedFormatKey + %#@count_signups@ + count_signups + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + one new signup + few + %ld new signups + many + %ld new signups + other + %ld new signups + + plural.count.people_boosted NSStringLocalizedFormatKey