mirror of
https://github.com/Ranchero-Software/NetNewsWire
synced 2025-08-12 06:26:36 +00:00
Merge branch 'main' into localize_strings
# Conflicts: # Mac/MainWindow/AddFeed/AddTwitterFeedWindowController.swift # Mac/MainWindow/MainWindowController.swift # NetNewsWire.xcodeproj/project.pbxproj # Shared/ArticleStyles/ArticleTheme.swift # iOS/Add/AddFeedViewController.swift # iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift # iOS/Article/ArticleViewController.swift # iOS/MasterFeed/MasterFeedViewController.swift
This commit is contained in:
@@ -15,7 +15,6 @@ import RSParser
|
||||
enum AddFeedType {
|
||||
case web
|
||||
case reddit
|
||||
case twitter
|
||||
}
|
||||
|
||||
class AddFeedViewController: UITableViewController {
|
||||
@@ -44,9 +43,6 @@ class AddFeedViewController: UITableViewController {
|
||||
case .reddit:
|
||||
navigationItem.title = NSLocalizedString("navigation.title.add-reddit-feed", comment: "Add Reddit Feed")
|
||||
navigationItem.leftBarButtonItem = nil
|
||||
case .twitter:
|
||||
navigationItem.title = NSLocalizedString("navigation.title.add-twitter-feed", comment: "Add Twitter Feed")
|
||||
navigationItem.leftBarButtonItem = nil
|
||||
default:
|
||||
break
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user