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

Consistent spelling of “favorite” in the UI

Browse Source 
Contributes to #399 [BUG] Multiple interactions do not collapse into a single notification
This commit is contained in:
shannon 2025-03-06 14:48:40 -05:00
parent 828e3c516e
commit 94d6a13e00
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Localization/app.json
View File

@ -738,7 +738,7 @@
"headers": {
"report": "Report",
"sign_up": "Signup",
"favourite": "Favourite",
"favourite": "Favorite",
"follow": "Follow",
"follow_request": "Follow request",
"moderation_warning": "Warning",
@ -755,10 +755,10 @@
"single_name_requested_to_follow_you": "%@ requested to follow you",
"single_name_posted": "%@ posted:",
"single_name_boosted": "%@ boosted:",
"single_name_favourited": "%@ favourited:",
"single_name_favourited": "%@ favorited:",
"single_name_followed_you": "%@ followed you",
"multiple_people_boosted": "%@ boosted:",
"multiple_people_favourited": "%@ favourited:",
"multiple_people_favourited": "%@ favorited:",
"multiple_people_followed_you": "%@ followed you",
"single_name_signed_up": "%@ signed up",
"someone_reported_account_for_rule_violation": "Someone reported %@ for rule violation.",

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

@ -964,9 +964,9 @@ public enum L10n {
public static func multiplePeopleBoosted(_ p1: Any) -> String {
return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.MultiplePeopleBoosted", String(describing: p1), fallback: "%@ boosted:")
}
/// %@ favourited:
/// %@ favorited:
public static func multiplePeopleFavourited(_ p1: Any) -> String {
return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.MultiplePeopleFavourited", String(describing: p1), fallback: "%@ favourited:")
return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.MultiplePeopleFavourited", String(describing: p1), fallback: "%@ favorited:")
}
/// %@ followed you
public static func multiplePeopleFollowedYou(_ p1: Any) -> String {
@ -976,9 +976,9 @@ public enum L10n {
public static func singleNameBoosted(_ p1: Any) -> String {
return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SingleNameBoosted", String(describing: p1), fallback: "%@ boosted:")
}
/// %@ favourited:
/// %@ favorited:
public static func singleNameFavourited(_ p1: Any) -> String {
return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SingleNameFavourited", String(describing: p1), fallback: "%@ favourited:")
return L10n.tr("Localizable", "Scene.Notification.GroupedNotificationDescription.SingleNameFavourited", String(describing: p1), fallback: "%@ favorited:")
}
/// %@ followed you
public static func singleNameFollowedYou(_ p1: Any) -> String {
@ -1020,8 +1020,8 @@ public enum L10n {
public static let boost = L10n.tr("Localizable", "Scene.Notification.Headers.Boost", fallback: "Boost")
/// Edit
public static let edit = L10n.tr("Localizable", "Scene.Notification.Headers.Edit", fallback: "Edit")
/// Favourite
public static let favourite = L10n.tr("Localizable", "Scene.Notification.Headers.Favourite", fallback: "Favourite")
/// Favorite
public static let favourite = L10n.tr("Localizable", "Scene.Notification.Headers.Favourite", fallback: "Favorite")
/// Follow
public static let follow = L10n.tr("Localizable", "Scene.Notification.Headers.Follow", fallback: "Follow")
/// Follow request

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

@ -349,18 +349,18 @@ Please retry in a few minutes.";
"Scene.Notification.GroupedNotificationDescription.SingleNameRequestedToFollowYou" = "%@ requested to follow you";
"Scene.Notification.GroupedNotificationDescription.SingleNamePosted" = "%@ posted:";
"Scene.Notification.GroupedNotificationDescription.SingleNameBoosted" = "%@ boosted:";
"Scene.Notification.GroupedNotificationDescription.SingleNameFavourited" = "%@ favourited:";
"Scene.Notification.GroupedNotificationDescription.SingleNameFavourited" = "%@ favorited:";
"Scene.Notification.GroupedNotificationDescription.SingleNameFollowedYou" = "%@ followed you";
"Scene.Notification.GroupedNotificationDescription.SingleNameRanPoll" = "%@ ran %@";
"Scene.Notification.GroupedNotificationDescription.MultiplePeopleBoosted" = "%@ boosted:";
"Scene.Notification.GroupedNotificationDescription.MultiplePeopleFavourited" = "%@ favourited:";
"Scene.Notification.GroupedNotificationDescription.MultiplePeopleFavourited" = "%@ favorited:";
"Scene.Notification.GroupedNotificationDescription.MultiplePeopleFollowedYou" = "%@ followed you";
"Scene.Notification.GroupedNotificationDescription.SingleNameSignedUp" = "%@ signed up";
"Scene.Notification.GroupedNotificationDescription.SomeoneReportedAccountForRuleViolation" = "Someone reported %@ for rule violation.";
"Scene.Notification.GroupedNotificationDescription.SomeoneReportedPostsFromAccountForRuleViolation" = "Someone reported %@ from %@ for rule violation.";
"Scene.Notification.Headers.Report" = "Report";
"Scene.Notification.Headers.SignUp" = "Signup";
"Scene.Notification.Headers.Favourite" = "Favourite";
"Scene.Notification.Headers.Favourite" = "Favorite";
"Scene.Notification.Headers.Follow" = "Follow";
"Scene.Notification.Headers.FollowRequest" = "Follow request";
"Scene.Notification.Headers.ModerationWarning" = "Warning";

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

@ -174,13 +174,13 @@
<key>NSStringFormatValueTypeKey</key>
<string>ld</string>
<key>one</key>
<string>one person favourited:</string>
<string>one person favorited:</string>
<key>few</key>
<string>%ld people favourited:</string>
<string>%ld people favorited:</string>
<key>many</key>
<string>%ld people favourited:</string>
<string>%ld people favorited:</string>
<key>other</key>
<string>%ld people favourited:</string>
<string>%ld people favorited:</string>
</dict>
</dict>
<key>plural.count.people_followed_you</key>

14
MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.stringsdict
View File

@ -140,13 +140,6 @@
<key>NSStringFormatValueTypeKey</key>
<string>ld</string>
<key>one</key>
<string>one person favourited:</string>
<key>few</key>
<string>%ld people favourited:</string>
<key>many</key>
<string>%ld people favourited:</string>
<key>other</key>
<string>%ld people favourited:</string>
</dict>
</dict>
<key>plural.count.people_followed_you</key>
@ -169,6 +162,13 @@
<string>%ld people followed you</string>
</dict>
</dict>
<string>one person favorited:</string>
<key>few</key>
<string>%ld people favorited:</string>
<key>many</key>
<string>%ld people favorited:</string>
<key>other</key>
<string>%ld people favorited:</string>
<key>plural.count.poll_that_you_and_others_voted_in</key>
<dict>
<key>NSStringLocalizedFormatKey</key>