Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix notification filters touches plural string (#1334) 

This PR fixes the following issues:

* Pluralized string on Notification Filters is not showing fallback
value
* Taps on avatar or user/username labels are intercepted on notification
filters list
This commit is contained in:
Marcus Kida 2024-07-30 15:09:30 +02:00 committed by GitHub
parent 892fac028d 6471316d46
commit 2d318407cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mastodon/Scene/Notification/Notification Filtering/Requests/NotificationRequestTableViewCell.swift
View File

@ -53,7 +53,8 @@ class NotificationRequestTableViewCell: UITableViewCell {
labelStackView.axis = .vertical labelStackView.axis = .vertical
labelStackView.alignment = .leading labelStackView.alignment = .leading
labelStackView.spacing = 4 labelStackView.spacing = 4
labelStackView.isUserInteractionEnabled = false
acceptNotificationRequestButton = HighlightDimmableButton() acceptNotificationRequestButton = HighlightDimmableButton()
acceptNotificationRequestButton.translatesAutoresizingMaskIntoConstraints = false acceptNotificationRequestButton.translatesAutoresizingMaskIntoConstraints = false
acceptNotificationRequestButton.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .semibold) acceptNotificationRequestButton.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .semibold)
@ -117,6 +118,7 @@ class NotificationRequestTableViewCell: UITableViewCell {
avatarStackView.axis = .horizontal avatarStackView.axis = .horizontal
avatarStackView.alignment = .center avatarStackView.alignment = .center
avatarStackView.spacing = 12 avatarStackView.spacing = 12
avatarStackView.isUserInteractionEnabled = false
contentStackView = UIStackView(arrangedSubviews: [avatarStackView, buttonStackView]) contentStackView = UIStackView(arrangedSubviews: [avatarStackView, buttonStackView])
contentStackView.translatesAutoresizingMaskIntoConstraints = false contentStackView.translatesAutoresizingMaskIntoConstraints = false

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

@ -1993,7 +1993,7 @@ public enum L10n {
public enum FilteredNotificationBanner { public enum FilteredNotificationBanner {
/// Plural format key: "%#@number_of_requests@" /// Plural format key: "%#@number_of_requests@"
public static func subtitle(_ p1: Int) -> String { public static func subtitle(_ p1: Int) -> String {
return L10n.tr("Localizable", "plural.filtered_notification_banner.subtitle", p1, fallback: "Plural format key: \"%#@number_of_requests@\"") return L10n.tr("Localizable", "plural.filtered_notification_banner.subtitle", p1, fallback: "%ld people you may know")
} }
} }
} }