This commit includes:

- Localisation for new SwiftUI Settings Views
- Inactive/Active Account sections in the Manage Account View
- Early work to deprecate AddAccountViewController
This commit is contained in:
Stuart Breckenridge
2022-12-15 09:30:28 +08:00
parent 369c346139
commit f42b6e5473
15 changed files with 461 additions and 189 deletions

View File

@@ -13,21 +13,21 @@ struct AboutView: View, LoadableAboutData {
var body: some View {
List {
Section(header: aboutHeaderView) {}
Section(header: Text("Primary Contributors")) {
Section(header: Text("PRIMARY_CONTRIBUTORS", tableName: "Settings")) {
ForEach(0..<about.PrimaryContributors.count, id: \.self) { i in
contributorView(about.PrimaryContributors[i])
}
}
Section(header: Text("Additional Contributors")) {
Section(header: Text("ADDITIONAL_CONTRIBUTORS", tableName: "Settings")) {
ForEach(0..<about.AdditionalContributors.count, id: \.self) { i in
contributorView(about.AdditionalContributors[i])
}
}
Section(header: Text("Thanks"), footer: thanks, content: {})
Section(header: Text("THANKS", tableName: "Settings"), footer: thanks, content: {})
Section(footer: copyright, content: {})
}
.listStyle(.insetGrouped)
.navigationTitle(Text("About"))
.navigationTitle(Text("ABOUT", tableName: "Settings"))
.navigationBarTitleDisplayMode(.inline)
}
@@ -46,7 +46,7 @@ struct AboutView: View, LoadableAboutData {
.foregroundColor(.secondary)
.font(.callout)
Text("By Brent Simmons and the Ranchero Software team.")
Text("BYLINE", tableName: "Settings")
.font(.subheadline)
Text("[netnewswire.com](https://netnewswire.com)")

View File

@@ -16,9 +16,9 @@ public enum HelpSheet: CustomStringConvertible, CaseIterable {
public var description: String {
switch self {
case .help:
return NSLocalizedString("NetNewsWire Help", comment: "NetNewsWire Help")
return NSLocalizedString("NETNEWSWIRE_HELP", tableName: "Settings", comment: "NetNewsWire Help")
case .website:
return NSLocalizedString("NetNewsWire Website", comment: "NetNewsWire Website")
return NSLocalizedString("NETNEWSWIRE_WEBSITE", tableName: "Settings", comment: "NetNewsWire Website")
}
}