From 3af430820229ffc6b8f8d3c07473b52f34ad9a8a Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Thu, 19 Jan 2023 17:36:50 -0800 Subject: [PATCH] use local text for more strings --- .../Share/Views/ShareExtensionView.swift | 8 ++-- .../Views/Highlights/HighlightsListView.swift | 2 +- .../App/Views/Home/HomeFeedViewIOS.swift | 43 ++++++++++++++++++- .../App/Views/Home/HomeFeedViewMac.swift | 10 ++--- .../App/Views/Labels/ApplyLabelsView.swift | 4 +- .../App/Views/Labels/FilterByLabelsView.swift | 4 +- .../Sources/App/Views/Labels/LabelsView.swift | 10 ++--- .../App/Views/LinkItemDetailView.swift | 2 +- .../Views/LinkedItemMetadataEditView.swift | 4 +- .../Views/Profile/NewsletterEmailsView.swift | 7 ++- .../App/Views/Profile/ProfileView.swift | 16 +++---- .../Profile/RecommendationGroupsView.swift | 2 +- .../App/Views/Profile/Subscriptions.swift | 2 +- .../App/Views/Profile/TextToSpeechView.swift | 2 +- .../App/Views/WebReader/RecommendToView.swift | 2 +- .../Views/WebReader/WebReaderContainer.swift | 2 +- .../Sources/App/Views/WelcomeView.swift | 2 +- .../Sources/Models/LinkedItemFilter.swift | 21 --------- .../Sources/Models/LinkedItemSort.swift | 13 ------ .../Article/HighlightAnnotationSheet.swift | 2 +- .../Views/FontSizeAdjustmentPopoverView.swift | 2 +- .../OmnivoreKit/Sources/Views/LocalText.swift | 27 ------------ .../Resources/en.lproj/Localizable.strings | 2 +- .../OmnivoreKit/Sources/Views/SearchBar.swift | 2 +- 24 files changed, 83 insertions(+), 108 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift index 550b05bf2..25f62116c 100644 --- a/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift +++ b/apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift @@ -281,7 +281,7 @@ public struct ShareExtensionView: View { extensionContext?.completeRequest(returningItems: [], completionHandler: nil) }, label: { - Label("Read Later", systemImage: "text.book.closed.fill") + Label(LocalText.readLaterGeneric, systemImage: "text.book.closed.fill") .padding(16) .frame(maxWidth: .infinity, maxHeight: .infinity) } @@ -378,7 +378,7 @@ public struct ShareExtensionView: View { } viewState = .mainView } - }, label: { Text("Cancel") }) + }, label: { Text(LocalText.cancelGeneric) }) .frame(maxWidth: .infinity, alignment: .leading) .opacity(viewState == .viewingHighlight ? 0.0 : 1.0) // Don't show viewState when viewing the highlight @@ -399,7 +399,7 @@ public struct ShareExtensionView: View { } } } - }, label: { Text("Done").bold() }) + }, label: { Text(LocalText.doneGeneric).bold() }) .frame(maxWidth: .infinity, alignment: .trailing) } .padding(8) @@ -559,7 +559,7 @@ struct ApplyLabelsListView: View { label: { HStack { Image(systemName: "plus.circle.fill").foregroundColor(.green) - Text("Create a new Label").foregroundColor(.appGrayTextContrast) + Text(LocalText.createLabelMessage).foregroundColor(.appGrayTextContrast) Spacer() } } diff --git a/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListView.swift b/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListView.swift index e732f7536..b0e5b8577 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Highlights/HighlightsListView.swift @@ -84,7 +84,7 @@ struct HighlightsListView: View { var dismissButton: some View { Button( action: { presentationMode.wrappedValue.dismiss() }, - label: { Text("Done").foregroundColor(.appGrayTextContrast) } + label: { Text(LocalText.doneGeneric).foregroundColor(.appGrayTextContrast) } ) } diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 81d30a8e4..100e1eed5 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -419,7 +419,7 @@ import Views } self.itemToRemove = nil } - Button("Cancel", role: .cancel) { self.itemToRemove = nil } + Button(LocalText.cancelGeneric, role: .cancel) { self.itemToRemove = nil } } } } @@ -507,7 +507,7 @@ import Views } self.itemToRemove = nil } - Button("Cancel", role: .cancel) { self.itemToRemove = nil } + Button(LocalText.cancelGeneric, role: .cancel) { self.itemToRemove = nil } } } } @@ -559,3 +559,42 @@ struct LinkDestination: View { } } } + +// TODO: move everything below this to another file +extension LinkedItemFilter { + var displayName: String { + switch self { + case .inbox: + return LocalText.inboxGeneric + case .readlater: + return LocalText.readLaterGeneric + case .newsletters: + return LocalText.newslettersGeneric + case .recommended: + return "Recommended" + case .all: + return LocalText.allGeneric + case .archived: + return LocalText.archivedGeneric + case .hasHighlights: + return LocalText.highlightedGeneric + case .files: + return LocalText.filesGeneric + } + } +} + +public extension LinkedItemSort { + var displayName: String { + switch self { + case .newest: + return LocalText.newestGeneric + case .oldest: + return LocalText.oldestGeneric + case .recentlyRead: + return LocalText.recentlyReadGeneric + case .recentlyPublished: + return LocalText.recentlyPublishedGeneric + } + } +} diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift index 60d1c6098..5731ddde1 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewMac.swift @@ -96,10 +96,10 @@ import Views placement: .toolbar ) { if viewModel.searchTerm.isEmpty { - Text("Inbox").searchCompletion("in:inbox ") - Text("All").searchCompletion("in:all ") - Text("Archived").searchCompletion("in:archive ") - Text("Files").searchCompletion("type:file ") + Text(LocalText.inboxGeneric).searchCompletion("in:inbox ") + Text(LocalText.allGeneric).searchCompletion("in:all ") + Text(LocalText.archivedGeneric).searchCompletion("in:archive ") + Text(LocalText.filesGeneric).searchCompletion("type:file ") } } .onChange(of: viewModel.searchTerm) { _ in @@ -137,7 +137,7 @@ import Views } } } - Button("Cancel", role: .cancel) { self.itemToRemove = nil } + Button(LocalText.cancelGeneric, role: .cancel) { self.itemToRemove = nil } } .sheet(item: $viewModel.itemUnderLabelEdit) { item in ApplyLabelsView(mode: .item(item), onSave: nil) diff --git a/apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift b/apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift index 84793a0fe..840933f9e 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift @@ -47,7 +47,7 @@ struct ApplyLabelsView: View { label: { HStack { Image(systemName: "plus.circle.fill").foregroundColor(.green) - Text("Create a new Label").foregroundColor(.appGrayTextContrast) + Text(LocalText.createLabelMessage).foregroundColor(.appGrayTextContrast) Spacer() } } @@ -124,7 +124,7 @@ struct ApplyLabelsView: View { var cancelButton: some View { Button( action: { presentationMode.wrappedValue.dismiss() }, - label: { Text("Cancel").foregroundColor(.appGrayTextContrast) } + label: { Text(LocalText.cancelGeneric).foregroundColor(.appGrayTextContrast) } ) } diff --git a/apple/OmnivoreKit/Sources/App/Views/Labels/FilterByLabelsView.swift b/apple/OmnivoreKit/Sources/App/Views/Labels/FilterByLabelsView.swift index 3d2311041..3cd6d2d7f 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Labels/FilterByLabelsView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Labels/FilterByLabelsView.swift @@ -54,7 +54,7 @@ struct FilterByLabelsView: View { ToolbarItem(placement: .navigationBarLeading) { Button( action: { presentationMode.wrappedValue.dismiss() }, - label: { Text("Cancel").foregroundColor(.appGrayTextContrast) } + label: { Text(LocalText.cancelGeneric).foregroundColor(.appGrayTextContrast) } ) } ToolbarItem(placement: .navigationBarTrailing) { @@ -63,7 +63,7 @@ struct FilterByLabelsView: View { onSave?(viewModel.selectedLabels, viewModel.negatedLabels) presentationMode.wrappedValue.dismiss() }, - label: { Text("Done").foregroundColor(.appGrayTextContrast) } + label: { Text(LocalText.doneGeneric).foregroundColor(.appGrayTextContrast) } ) } } diff --git a/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift b/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift index 1b09bb0e7..c145391f1 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift @@ -10,8 +10,6 @@ struct LabelsView: View { @State private var showDeleteConfirmation = false @State private var labelToRemove: LinkedItemLabel? - let footerText = "Use labels to create curated collections of links." - var body: some View { Group { #if os(iOS) @@ -37,7 +35,7 @@ struct LabelsView: View { } self.labelToRemove = nil } - Button("Cancel", role: .cancel) { self.labelToRemove = nil } + Button(LocalText.cancelGeneric, role: .cancel) { self.labelToRemove = nil } } .sheet(isPresented: $viewModel.showCreateLabelModal) { CreateLabelView(viewModel: viewModel) @@ -47,13 +45,13 @@ struct LabelsView: View { private var innerBody: some View { Group { - Section(footer: Text(footerText)) { + Section(footer: Text(LocalText.labelsPurposeDescription)) { Button( action: { viewModel.showCreateLabelModal = true }, label: { HStack { Image(systemName: "plus.circle.fill").foregroundColor(.green) - Text("Create a new Label").foregroundColor(.appGrayTextContrast) + Text(LocalText.createLabelMessage).foregroundColor(.appGrayTextContrast) Spacer() } } @@ -169,7 +167,7 @@ struct CreateLabelView: View { var cancelCreateLabelButton: some View { Button( action: { viewModel.showCreateLabelModal = false }, - label: { Text("Cancel").foregroundColor(.appGrayTextContrast) } + label: { Text(LocalText.cancelGeneric).foregroundColor(.appGrayTextContrast) } ) } diff --git a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift index ea5576b93..5eeafbe4c 100644 --- a/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/LinkItemDetailView.swift @@ -184,7 +184,7 @@ struct LinkItemDetailView: View { Button("Remove Link", role: .destructive) { viewModel.handleDeleteAction(dataService: dataService) } - Button("Cancel", role: .cancel, action: {}) + Button(LocalText.cancelGeneric, role: .cancel, action: {}) } .sheet(isPresented: $showTitleEdit) { if let item = viewModel.item { diff --git a/apple/OmnivoreKit/Sources/App/Views/LinkedItemMetadataEditView.swift b/apple/OmnivoreKit/Sources/App/Views/LinkedItemMetadataEditView.swift index 821b8cf67..4af279429 100644 --- a/apple/OmnivoreKit/Sources/App/Views/LinkedItemMetadataEditView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/LinkedItemMetadataEditView.swift @@ -104,7 +104,7 @@ struct LinkedItemMetadataEditView: View { ToolbarItem(placement: .barLeading) { Button( action: { presentationMode.wrappedValue.dismiss() }, - label: { Text("Cancel").foregroundColor(.appGrayTextContrast) } + label: { Text(LocalText.cancelGeneric).foregroundColor(.appGrayTextContrast) } ) } } @@ -125,7 +125,7 @@ struct LinkedItemMetadataEditView: View { Button( action: { presentationMode.wrappedValue.dismiss() }, - label: { Text("Cancel").foregroundColor(.appGrayTextContrast) } + label: { Text(LocalText.cancelGeneric).foregroundColor(.appGrayTextContrast) } ) } } diff --git a/apple/OmnivoreKit/Sources/App/Views/Profile/NewsletterEmailsView.swift b/apple/OmnivoreKit/Sources/App/Views/Profile/NewsletterEmailsView.swift index a1b5c6932..ffd878a3a 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Profile/NewsletterEmailsView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Profile/NewsletterEmailsView.swift @@ -37,7 +37,6 @@ import Views struct NewsletterEmailsView: View { @EnvironmentObject var dataService: DataService @StateObject var viewModel = NewsletterEmailsViewModel() - let footerText = "Add PDFs to your library, or subscribe to newsletters using an Omnivore email address." var body: some View { Group { @@ -57,7 +56,7 @@ struct NewsletterEmailsView: View { private var innerBody: some View { Group { - Section(footer: Text(footerText)) { + Section(footer: Text(LocalText.newslettersDescription)) { Button( action: { Task { await viewModel.createEmail(dataService: dataService) } @@ -65,7 +64,7 @@ struct NewsletterEmailsView: View { label: { HStack { Image(systemName: "plus.circle.fill").foregroundColor(.green) - Text("Create a new email address") + Text(LocalText.createNewEmailMessage) Spacer() } } @@ -96,6 +95,6 @@ struct NewsletterEmailsView: View { } } } - .navigationTitle("Emails") + .navigationTitle(LocalText.emailsGeneric) } } diff --git a/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift b/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift index 153523f10..40458b7d8 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift @@ -83,11 +83,11 @@ struct ProfileView: View { } NavigationLink(destination: NewsletterEmailsView()) { - Text("Emails") + Text(LocalText.emailsGeneric) } NavigationLink(destination: SubscriptionsView()) { - Text("Subscriptions") + Text(LocalText.subscriptionsGeneric) } NavigationLink(destination: GroupsView()) { @@ -113,7 +113,7 @@ struct ProfileView: View { Text("Push Notifications") } NavigationLink(destination: TextToSpeechView()) { - Text("Text to Speech") + Text(LocalText.textToSpeechGeneric) } } #endif @@ -122,19 +122,19 @@ struct ProfileView: View { NavigationLink( destination: BasicWebAppView.privacyPolicyWebView(baseURL: dataService.appEnvironment.webAppBaseURL) ) { - Text("Privacy Policy") + Text(LocalText.privacyPolicyGeneric) } NavigationLink( destination: BasicWebAppView.termsConditionsWebView(baseURL: dataService.appEnvironment.webAppBaseURL) ) { - Text("Terms and Conditions") + Text(LocalText.termsAndConditionsGeneric) } #if os(iOS) Button( action: { DataService.showIntercomMessenger?() }, - label: { Text("Feedback") } + label: { Text(LocalText.feedbackGeneric) } ) #endif } @@ -143,10 +143,10 @@ struct ProfileView: View { NavigationLink( destination: ManageAccountView() ) { - Text("Manage Account") + Text(LocalText.manageAccountGeneric) } - Text("Logout") + Text(LocalText.logoutGeneric) .onTapGesture { showLogoutConfirmation = true } diff --git a/apple/OmnivoreKit/Sources/App/Views/Profile/RecommendationGroupsView.swift b/apple/OmnivoreKit/Sources/App/Views/Profile/RecommendationGroupsView.swift index f6703e15a..201ff11f6 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Profile/RecommendationGroupsView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Profile/RecommendationGroupsView.swift @@ -104,7 +104,7 @@ struct CreateRecommendationGroupView: View { .navigationBarItems(leading: Button(action: { viewModel.showCreateSheet = false - }, label: { Text("Cancel") }), + }, label: { Text(LocalText.cancelGeneric) }), trailing: nextButton) } } diff --git a/apple/OmnivoreKit/Sources/App/Views/Profile/Subscriptions.swift b/apple/OmnivoreKit/Sources/App/Views/Profile/Subscriptions.swift index 9fa414f79..28faec9e0 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Profile/Subscriptions.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Profile/Subscriptions.swift @@ -115,7 +115,7 @@ struct SubscriptionsView: View { viewModel.subscriptionNameToCancel = nil } } - .navigationTitle("Subscriptions") + .navigationTitle(LocalText.subscriptionsGeneric) } } diff --git a/apple/OmnivoreKit/Sources/App/Views/Profile/TextToSpeechView.swift b/apple/OmnivoreKit/Sources/App/Views/Profile/TextToSpeechView.swift index 5a27786c4..3aad4e53c 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Profile/TextToSpeechView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Profile/TextToSpeechView.swift @@ -18,7 +18,7 @@ } innerBody } - }.navigationTitle("Text to Speech") + }.navigationTitle(LocalText.textToSpeechGeneric) } private var innerBody: some View { diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/RecommendToView.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/RecommendToView.swift index 6236ee7ce..80ecc315a 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/RecommendToView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/RecommendToView.swift @@ -211,7 +211,7 @@ struct RecommendToView: View { .navigationViewStyle(.stack) .navigationBarItems(leading: Button(action: { dismiss() - }, label: { Text("Cancel") }), + }, label: { Text(LocalText.cancelGeneric) }), trailing: nextButton) .task { await viewModel.loadGroups(dataService: dataService) diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift index fea5ddbc9..649a20a9b 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContainer.swift @@ -292,7 +292,7 @@ struct WebReaderContainerView: View { presentationMode.wrappedValue.dismiss() #endif } - Button("Cancel", role: .cancel, action: {}) + Button(LocalText.cancelGeneric, role: .cancel, action: {}) } .sheet(isPresented: $showLabelsModal) { ApplyLabelsView(mode: .item(item), onSave: { _ in showLabelsModal = false }) diff --git a/apple/OmnivoreKit/Sources/App/Views/WelcomeView.swift b/apple/OmnivoreKit/Sources/App/Views/WelcomeView.swift index ab9362812..2d0b69c40 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WelcomeView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WelcomeView.swift @@ -72,7 +72,7 @@ struct WelcomeView: View { Text("By signing up, you agree to Omnivore’s\n") + Text("Terms of Service").underline() + Text(" and ") - + Text("Privacy Policy").underline() + + Text(LocalText.privacyPolicyGeneric).underline() } .font(.appSubheadline) .confirmationDialog("", isPresented: $showTermsLinks, titleVisibility: .hidden) { diff --git a/apple/OmnivoreKit/Sources/Models/LinkedItemFilter.swift b/apple/OmnivoreKit/Sources/Models/LinkedItemFilter.swift index 7a3bbc261..f066432a5 100644 --- a/apple/OmnivoreKit/Sources/Models/LinkedItemFilter.swift +++ b/apple/OmnivoreKit/Sources/Models/LinkedItemFilter.swift @@ -12,27 +12,6 @@ public enum LinkedItemFilter: String, CaseIterable { } public extension LinkedItemFilter { - var displayName: String { - switch self { - case .inbox: - return "Inbox" - case .readlater: - return "Read Later" - case .newsletters: - return "Newsletters" - case .recommended: - return "Recommended" - case .all: - return "All" - case .archived: - return "Archived" - case .hasHighlights: - return "Highlighted" - case .files: - return "Files" - } - } - var queryString: String { switch self { case .inbox: diff --git a/apple/OmnivoreKit/Sources/Models/LinkedItemSort.swift b/apple/OmnivoreKit/Sources/Models/LinkedItemSort.swift index 7e060955b..706e6833e 100644 --- a/apple/OmnivoreKit/Sources/Models/LinkedItemSort.swift +++ b/apple/OmnivoreKit/Sources/Models/LinkedItemSort.swift @@ -8,19 +8,6 @@ public enum LinkedItemSort: String, CaseIterable { } public extension LinkedItemSort { - var displayName: String { - switch self { - case .newest: - return "Newest" - case .oldest: - return "Oldest" - case .recentlyRead: - return "Recently Read" - case .recentlyPublished: - return "Recently Published" - } - } - var queryString: String { switch self { case .newest: diff --git a/apple/OmnivoreKit/Sources/Views/Article/HighlightAnnotationSheet.swift b/apple/OmnivoreKit/Sources/Views/Article/HighlightAnnotationSheet.swift index c461327be..d82246b50 100644 --- a/apple/OmnivoreKit/Sources/Views/Article/HighlightAnnotationSheet.swift +++ b/apple/OmnivoreKit/Sources/Views/Article/HighlightAnnotationSheet.swift @@ -26,7 +26,7 @@ public struct HighlightAnnotationSheet: View { public var body: some View { VStack { HStack { - Button("Cancel", action: onCancel) + Button(LocalText.cancelGeneric, action: onCancel) Spacer() Label("Note", systemImage: "note.text") Spacer() diff --git a/apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift b/apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift index 94ddb23cd..e690cac9c 100644 --- a/apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift +++ b/apple/OmnivoreKit/Sources/Views/FontSizeAdjustmentPopoverView.swift @@ -201,7 +201,7 @@ public enum WebFont: String, CaseIterable { // ToolbarItem(placement: .barTrailing) { // Button( // action: dismissAction, -// label: { Text("Done").foregroundColor(.appGrayTextContrast).padding() } +// label: { Text(LocalText.doneGeneric).foregroundColor(.appGrayTextContrast).padding() } // ) // } // } diff --git a/apple/OmnivoreKit/Sources/Views/LocalText.swift b/apple/OmnivoreKit/Sources/Views/LocalText.swift index 9f17b93c2..87af4a557 100644 --- a/apple/OmnivoreKit/Sources/Views/LocalText.swift +++ b/apple/OmnivoreKit/Sources/Views/LocalText.swift @@ -49,30 +49,3 @@ public enum LocalText { public static let labelsPurposeDescription = localText(key: "labels.purpose.description") public static let noCurrentSubscriptionsMessage = localText(key: "no.current.subscriptions.message") } - -// "emails.generic" = "Emails"; -// "subscriptions.generic" = "Subscriptions"; -// "textToSpeech.generic" = "Subscriptions"; -// "privacy.policy.generic" = "Privacy Policy"; -// "termsAndConditions.generic" = "Terms and Conditions"; -// "feedback.generic" = "Feedback"; -// "manageAccount.generic" = "Manage Account"; -// "logout.generic" = "Logout"; -// "done.generic" = "Done"; -// "cancel.generic" = "Cancel"; -// "inbox.generic" = "Inbox"; -// "readLater.generic" = "Read Later"; -// "newsletters.generic" = "Newsletters"; -// "all.generic" = "All"; -// "archived.generic" = "Archived"; -// "highlighted.generic" = "Highlighted"; -// "files.generic" = "Files"; -// "newest.generic" = "Newest"; -// "oldest.generic" = "Oldest"; -// "recentlyRead.generic" = "Recently Read"; -// "recentlyPublished.generic" = "Recently Published"; -// "create.label.message" = "Create a new Label"; -// "create.new.email.message" = "Create a new email address"; -// "newsletters.description" = "Add PDFs to your library, or subscribe to newsletters using an Omnivore email address."; -// "labels.purpose.description" = "Use labels to create curated collections of links."; -// "no.current.subscriptions.message" = "You have no current Subscriptions."; diff --git a/apple/OmnivoreKit/Sources/Views/Resources/en.lproj/Localizable.strings b/apple/OmnivoreKit/Sources/Views/Resources/en.lproj/Localizable.strings index d4f9d0996..4b2c8930c 100644 --- a/apple/OmnivoreKit/Sources/Views/Resources/en.lproj/Localizable.strings +++ b/apple/OmnivoreKit/Sources/Views/Resources/en.lproj/Localizable.strings @@ -17,7 +17,7 @@ "labels.generic" = "Labels"; "emails.generic" = "Emails"; -"subscriptions.generic" = "Subscriptions"; +"subscriptions.generic" = "Text to Speech"; "textToSpeech.generic" = "Subscriptions"; "privacy.policy.generic" = "Privacy Policy"; "termsAndConditions.generic" = "Terms and Conditions"; diff --git a/apple/OmnivoreKit/Sources/Views/SearchBar.swift b/apple/OmnivoreKit/Sources/Views/SearchBar.swift index be32bc3d1..e66fc9587 100644 --- a/apple/OmnivoreKit/Sources/Views/SearchBar.swift +++ b/apple/OmnivoreKit/Sources/Views/SearchBar.swift @@ -51,7 +51,7 @@ public struct SearchBar: View { self.isFocused = false }, label: { - Text("Cancel") + Text(LocalText.cancelGeneric) } ) .padding(.trailing, 10)