zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Replace localizable format for new signups with plural

Browse Source
This commit is contained in:
shannon 2025-04-03 08:54:45 -04:00
parent a785a36a0e
commit 7975b13d2a
6 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Localization/StringsConvertor/input/Base.lproj/app.json
View File

@ -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",

1
Localization/app.json
View File

@ -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."

2
Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift
View File

@ -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)
}

8
MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
View File

@ -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@\"")

1
MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
View File

@ -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:";

20
MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.stringsdict
View File

@ -112,6 +112,26 @@
<string>%ld others</string>
</dict>
</dict>
<key>plural.count.new_signups</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@count_signups@</string>
<key>count_signups</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>ld</string>
<key>one</key>
<string>one new signup</string>
<key>few</key>
<string>%ld new signups</string>
<key>many</key>
<string>%ld new signups</string>
<key>other</key>
<string>%ld new signups</string>
</dict>
</dict>
<key>plural.count.people_boosted</key>
<dict>
<key>NSStringLocalizedFormatKey</key>