From fd6ba67aee283ffc18145ef890b3a26c194d6190 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Sat, 21 Jan 2023 19:43:26 +0800 Subject: [PATCH] Renames Default theme to NetNewsWire MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Where ‘NetNewsWire’ is used `NSLocalizedString` has been removed. This is done so that NetNewsWire is not picked via Export Localizations. --- Shared/ArticleStyles/ArticleTheme.swift | 2 +- iOS/AppDefaults.swift | 2 +- iOS/Article/ArticleViewController.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Shared/ArticleStyles/ArticleTheme.swift b/Shared/ArticleStyles/ArticleTheme.swift index f10219f46..c2d4e31cd 100644 --- a/Shared/ArticleStyles/ArticleTheme.swift +++ b/Shared/ArticleStyles/ArticleTheme.swift @@ -20,7 +20,7 @@ struct ArticleTheme: Equatable { static let defaultTheme = ArticleTheme() static let nnwThemeSuffix = ".nnwtheme" - private static let defaultThemeName = NSLocalizedString("Default", comment: "Default") + private static let defaultThemeName = "NetNewsWire" private static let unknownValue = NSLocalizedString("Unknown", comment: "Unknown Value") let path: String? diff --git a/iOS/AppDefaults.swift b/iOS/AppDefaults.swift index 10ed0af43..fe76c03d7 100644 --- a/iOS/AppDefaults.swift +++ b/iOS/AppDefaults.swift @@ -28,7 +28,7 @@ enum UserInterfaceColorPalette: Int, CustomStringConvertible, CaseIterable { final class AppDefaults { - static let defaultThemeName = "Default" + static let defaultThemeName = "NetNewsWire" static let shared = AppDefaults() private init() {} diff --git a/iOS/Article/ArticleViewController.swift b/iOS/Article/ArticleViewController.swift index e6ba57c35..7677c14e7 100644 --- a/iOS/Article/ArticleViewController.swift +++ b/iOS/Article/ArticleViewController.swift @@ -267,7 +267,7 @@ class ArticleViewController: UIViewController, MainControllerIdentifiable, Loggi themeActions.append(action) } - let defaultThemeAction = UIAction(title: NSLocalizedString("Default", comment: "Default"), + let defaultThemeAction = UIAction(title: "NetNewsWire", image: nil, identifier: nil, discoverabilityTitle: nil,