From 6462264fde9e44f0a069507a1460e74b10cb5955 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Fri, 10 Feb 2023 09:51:12 +0800 Subject: [PATCH] Localization files updated --- Mac/AppDelegate.swift | 6 +++--- Mac/Resources/en-GB.lproj/Localizable.strings | 6 ++++++ Mac/Resources/en.lproj/Localizable.strings | 6 ++++++ iOS/MasterFeed/MasterFeedViewController.swift | 8 ++++---- iOS/Resources/en-GB.lproj/Localizable.strings | 12 ++++++++++++ iOS/Resources/en.lproj/Localizable.strings | 12 ++++++++++++ .../Extensions/ExtensionsManagementView.swift | 2 +- iOS/SwiftUI Extensions/InjectedNavigationView.swift | 2 +- 8 files changed, 45 insertions(+), 9 deletions(-) diff --git a/Mac/AppDelegate.swift b/Mac/AppDelegate.swift index 97923bdae..63676411e 100644 --- a/Mac/AppDelegate.swift +++ b/Mac/AppDelegate.swift @@ -975,9 +975,9 @@ internal extension AppDelegate { DispatchQueue.main.async { let alert = NSAlert() alert.alertStyle = .warning - alert.messageText = NSLocalizedString("Twitter Integration Removed", comment: "Twitter Integration Removed") - alert.informativeText = NSLocalizedString("On February 1, 2023, Twitter announced the end of free access to the Twitter API, effective February 9.\n\nSince Twitter does not provide RSS feeds, we’ve had to use the Twitter API. Without free access to that API, we can’t read feeds from Twitter.\n\nWe’ve left your Twitter feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded. However, those feeds will no longer update.", comment: "Twitter deprecation informative text.") - alert.addButton(withTitle: NSLocalizedString("OK", comment: "OK")) + alert.messageText = NSLocalizedString("alert.title.twitter-integration-removed", comment: "Twitter Integration Removed") + alert.informativeText = NSLocalizedString("alert.message.twitter-integration-removed", comment: "Twitter deprecation informative text.") + alert.addButton(withTitle: NSLocalizedString("button.title.ok", comment: "OK")) alert.buttons[0].keyEquivalent = "\r" alert.runModal() } diff --git a/Mac/Resources/en-GB.lproj/Localizable.strings b/Mac/Resources/en-GB.lproj/Localizable.strings index 6b8998f19..75c403e88 100644 --- a/Mac/Resources/en-GB.lproj/Localizable.strings +++ b/Mac/Resources/en-GB.lproj/Localizable.strings @@ -110,6 +110,9 @@ /* The theme “%@” has been installed. */ "alert.message.theme-installed.%@" = "The theme “%@” has been installed."; +/* Twitter Deprecation Message */ +"alert.message.twitter-deprecation-message" = "On February 1, 2023, Twitter announced the end of free access to the Twitter API, effective February 9.\n\nSince Twitter does not provide RSS feeds, we’ve had to use the Twitter API. Without free access to that API, we can’t read feeds from Twitter.\n\nWe’ve left your Twitter feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded. However, those feeds will no longer update."; + /* Already subscribed */ "alert.title.already-subscribed" = "Already subscribed"; @@ -158,6 +161,9 @@ /* Theme installed */ "alert.title.theme-installed" = "Theme installed"; +/* Twitter Integration Removed */ +"alert.title.twitter-integration-removed" = "Twitter Integration Removed"; + /* Alert title when adding a Feedly account and waiting for authorization from the user. */ "alert.title.waiting-for-feedly-access" = "Waiting for Feedly access..."; diff --git a/Mac/Resources/en.lproj/Localizable.strings b/Mac/Resources/en.lproj/Localizable.strings index 0277ca253..76dd21ede 100644 --- a/Mac/Resources/en.lproj/Localizable.strings +++ b/Mac/Resources/en.lproj/Localizable.strings @@ -107,6 +107,9 @@ /* The theme “%@” has been installed. */ "alert.message.theme-installed.%@" = "The theme “%@” has been installed."; +/* Twitter Deprecation Message */ +"alert.message.twitter-deprecation-message" = "On February 1, 2023, Twitter announced the end of free access to the Twitter API, effective February 9.\n\nSince Twitter does not provide RSS feeds, we’ve had to use the Twitter API. Without free access to that API, we can’t read feeds from Twitter.\n\nWe’ve left your Twitter feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded. However, those feeds will no longer update."; + /* Already subscribed */ "alert.title.already-subscribed" = "Already subscribed"; @@ -155,6 +158,9 @@ /* Theme installed */ "alert.title.theme-installed" = "Theme installed"; +/* Twitter Integration Removed */ +"alert.title.twitter-integration-removed" = "Twitter Integration Removed"; + /* Alert title when adding a Feedly account and waiting for authorization from the user. */ "alert.title.waiting-for-feedly-access" = "Waiting for Feedly access..."; diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 3512a933d..7381bd7f5 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -688,8 +688,8 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner, Ma } private func showTwitterDeprecationAlert() { - let alert = UIAlertController(title: NSLocalizedString("Twitter Integration Removed", comment: "Twitter Integration Removed"), - message: NSLocalizedString("On February 1, 2023, Twitter announced the end of free access to the Twitter API, effective February 9.\n\nSince Twitter does not provide RSS feeds, we’ve had to use the Twitter API. Without free access to that API, we can’t read feeds from Twitter.\n\nWe’ve left your Twitter feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded. However, those feeds will no longer update.", comment: "Twitter deprecation message"), + let alert = UIAlertController(title: NSLocalizedString("alert.title.twitter-integration-removed", comment: "Twitter Integration Removed"), + message: NSLocalizedString("alert.message.twitter-integration-removed", comment: "Twitter deprecation message"), preferredStyle: .alert) alert.addAction(UIAlertAction(title: "OK", style: .cancel)) @@ -768,12 +768,12 @@ private extension MasterFeedViewController { func setFilterButtonToActive() { filterButton?.image = AppAssets.filterActiveImage - filterButton?.accLabelText = NSLocalizedString("Selected - Filter Read Feeds", comment: "Selected - Filter Read Feeds") + filterButton?.accLabelText = NSLocalizedString("button.accessibility.title.selected-filter-read-feeds", comment: "Selected - Filter Read Feeds") } func setFilterButtonToInactive() { filterButton?.image = AppAssets.filterInactiveImage - filterButton?.accLabelText = NSLocalizedString("Filter Read Feeds", comment: "Filter Read Feeds") + filterButton?.accLabelText = NSLocalizedString("button.accessibility.title.filter-read-feeds", comment: "Filter Read Feeds") } func resetEstimatedRowHeight() { diff --git a/iOS/Resources/en-GB.lproj/Localizable.strings b/iOS/Resources/en-GB.lproj/Localizable.strings index e9ef95064..31a2d9add 100644 --- a/iOS/Resources/en-GB.lproj/Localizable.strings +++ b/iOS/Resources/en-GB.lproj/Localizable.strings @@ -129,6 +129,9 @@ /* Error message when a value is missing. In English, the message is: This theme cannot be used because the the value—“%@”—is not found in the Info.plist. */ "alert.message.theme-value-missing.%@" = "This theme cannot be used because the the value—“%@”—is not found in the Info.plist."; +/* Twitter Deprecation Message */ +"alert.message.twitter-deprecation-message" = "On February 1, 2023, Twitter announced the end of free access to the Twitter API, effective February 9.\n\nSince Twitter does not provide RSS feeds, we’ve had to use the Twitter API. Without free access to that API, we can’t read feeds from Twitter.\n\nWe’ve left your Twitter feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded. However, those feeds will no longer update."; + /* Are you sure you want to deactivate “%@“? */ "alert.title.deactivate-extension.%@" = "Are you sure you want to deactivate “%@“?"; @@ -181,6 +184,9 @@ /* Theme installed */ "alert.title.theme-installed" = "Theme Installed"; +/* Twitter Integration Removed */ +"alert.title.twitter-integration-removed" = "Twitter Integration Removed"; + /* Automatic */ "appdefaults.colorpalette.automatic" = "Automatic"; @@ -190,6 +196,12 @@ /* Light */ "appdefaults.colorpalette.light" = "Light"; +/* Filter Read Feeds */ +"button.accessibility.title.filter-read-feeds" = "Filter Read Feeds"; + +/* Selected - Filter Read Feeds */ +"button.accessibility.title.selected-filter-read-feeds" = "Selected - Filter Read Feeds"; + /* Error - Reader View */ "button.accessibility.title.error-readerview" = "Error - Reader View"; diff --git a/iOS/Resources/en.lproj/Localizable.strings b/iOS/Resources/en.lproj/Localizable.strings index 25f662c0b..0c25dbaec 100644 --- a/iOS/Resources/en.lproj/Localizable.strings +++ b/iOS/Resources/en.lproj/Localizable.strings @@ -123,6 +123,9 @@ /* Error message when a value is missing. In English, the message is: This theme cannot be used because the the value—“%@”—is not found in the Info.plist. */ "alert.message.theme-value-missing.%@" = "This theme cannot be used because the the value—“%@”—is not found in the Info.plist."; +/* Twitter Deprecation Message */ +"alert.message.twitter-deprecation-message" = "On February 1, 2023, Twitter announced the end of free access to the Twitter API, effective February 9.\n\nSince Twitter does not provide RSS feeds, we’ve had to use the Twitter API. Without free access to that API, we can’t read feeds from Twitter.\n\nWe’ve left your Twitter feeds intact. If you have any starred items from those feeds, they will remain as long as you don’t delete those feeds.\n\nYou can still read whatever you have already downloaded. However, those feeds will no longer update."; + /* Are you sure you want to deactivate “%@“? */ "alert.title.deactivate-extension.%@" = "Are you sure you want to deactivate “%@“?"; @@ -175,6 +178,9 @@ /* Theme installed */ "alert.title.theme-installed" = "Theme Installed"; +/* Twitter Integration Removed */ +"alert.title.twitter-integration-removed" = "Twitter Integration Removed"; + /* Automatic */ "appdefaults.colorpalette.automatic" = "Automatic"; @@ -184,6 +190,12 @@ /* Light */ "appdefaults.colorpalette.light" = "Light"; +/* Filter Read Feeds */ +"button.accessibility.title.filter-read-feeds" = "Filter Read Feeds"; + +/* Selected - Filter Read Feeds */ +"button.accessibility.title.selected-filter-read-feeds" = "Selected - Filter Read Feeds"; + /* Error - Reader View */ "button.accessibility.title.error-readerview" = "Error - Reader View"; diff --git a/iOS/Settings/Account and Extensions/Extensions/ExtensionsManagementView.swift b/iOS/Settings/Account and Extensions/Extensions/ExtensionsManagementView.swift index 92b0c9b71..a9f6a52ab 100644 --- a/iOS/Settings/Account and Extensions/Extensions/ExtensionsManagementView.swift +++ b/iOS/Settings/Account and Extensions/Extensions/ExtensionsManagementView.swift @@ -45,7 +45,7 @@ struct ExtensionsManagementView: View { Button(role: .cancel) { extensionToDeactivate = nil } label: { - Text("Cancel", comment: "Button title") + Text("button.title.cancel", comment: "Button title") } } message: { diff --git a/iOS/SwiftUI Extensions/InjectedNavigationView.swift b/iOS/SwiftUI Extensions/InjectedNavigationView.swift index 9c10b55bd..2696739a8 100644 --- a/iOS/SwiftUI Extensions/InjectedNavigationView.swift +++ b/iOS/SwiftUI Extensions/InjectedNavigationView.swift @@ -21,7 +21,7 @@ struct InjectedNavigationView: View { Button(role: .cancel) { dismiss() } label: { - Text("Done", comment: "Button title") + Text("button.title.done", comment: "Button title") } } }