FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

standardised naming

This commit is contained in:
Stuart Breckenridge 2021-04-19 11:21:00 +08:00
parent d4130e7c65
commit 5af2643479
No known key found for this signature in database
GPG Key ID: ED2F112EEA9EF8A5
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Account/Sources/Account/WebFeed.swift
View File

@ -242,7 +242,7 @@ public final class WebFeed: Feed, Renamable, Hashable {
} }
// MARK: - NotificationDisplayName // MARK: - NotificationDisplayName
public var notifyNameDisplay: String { public var notificationDisplayName: String {
#if os(macOS) #if os(macOS)
if self.url.contains("twitter.com") { if self.url.contains("twitter.com") {
return NSLocalizedString("Show notifications for new tweets", comment: "notifyNameDisplay / Twitter") return NSLocalizedString("Show notifications for new tweets", comment: "notifyNameDisplay / Twitter")

2
Mac/Inspector/WebFeedInspectorViewController.swift
View File

@ -183,7 +183,7 @@ private extension WebFeedInspectorViewController {
} }
func updateNotifyAboutNewArticles() { func updateNotifyAboutNewArticles() {
isNotifyAboutNewArticlesCheckBox?.title = feed?.notifyNameDisplay ?? NSLocalizedString("Show notifications for new articles", comment: "Show notifications for new articles") isNotifyAboutNewArticlesCheckBox?.title = feed?.notificationDisplayName ?? NSLocalizedString("Show notifications for new articles", comment: "Show notifications for new articles")
isNotifyAboutNewArticlesCheckBox?.state = (feed?.isNotifyAboutNewArticles ?? false) ? .on : .off isNotifyAboutNewArticlesCheckBox?.state = (feed?.isNotifyAboutNewArticles ?? false) ? .on : .off
} }

2
Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift
View File

@ -230,7 +230,7 @@ private extension SidebarViewController {
} }
menu.addItem(NSMenuItem.separator()) menu.addItem(NSMenuItem.separator())
let notificationText = webFeed.notifyNameDisplay.capitalized let notificationText = webFeed.notificationDisplayName.capitalized
let notificationMenuItem = menuItem(notificationText, #selector(toggleNotificationsFromContextMenu(_:)), webFeed) let notificationMenuItem = menuItem(notificationText, #selector(toggleNotificationsFromContextMenu(_:)), webFeed)
if webFeed.isNotifyAboutNewArticles == nil || webFeed.isNotifyAboutNewArticles! == false { if webFeed.isNotifyAboutNewArticles == nil || webFeed.isNotifyAboutNewArticles! == false {

2
iOS/Inspector/WebFeedInspectorViewController.swift
View File

@ -162,7 +162,7 @@ extension WebFeedInspectorViewController {
return cell return cell
} }
label.numberOfLines = 2 label.numberOfLines = 2
label.text = webFeed.notifyNameDisplay.capitalized label.text = webFeed.notificationDisplayName.capitalized
} }
return cell return cell
} }