Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Commit

Permalink
Fix #3736: Rename Brave Today to Brave News and unlock RSS limit & OPML
Browse files Browse the repository at this point in the history
  • Loading branch information
kylehickinson committed Jun 2, 2021
1 parent 5886769 commit 4e48404
Show file tree
Hide file tree
Showing 47 changed files with 282 additions and 333 deletions.
40 changes: 11 additions & 29 deletions BraveShared/BraveStrings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1995,11 +1995,11 @@ extension Strings {
}

extension Strings {
public struct BraveToday {
public static let braveToday = NSLocalizedString(
public struct BraveNews {
public static let braveNews = NSLocalizedString(
"today.braveToday",
bundle: .braveShared,
value: "Brave Today",
value: "Brave News",
comment: "The name of the feature"
)
public static let sourcesAndSettings = NSLocalizedString(
Expand All @@ -2008,10 +2008,10 @@ extension Strings {
value: "Sources & Settings",
comment: ""
)
public static let turnOnBraveToday = NSLocalizedString(
public static let turnOnBraveNews = NSLocalizedString(
"today.turnOnBraveToday",
bundle: .braveShared,
value: "Turn on Brave Today",
value: "Turn on Brave News",
comment: ""
)
public static let learnMoreTitle = NSLocalizedString(
Expand All @@ -2029,7 +2029,7 @@ extension Strings {
public static let introCardBody = NSLocalizedString(
"today.introCardBody",
bundle: .braveShared,
value: "Brave Today is ad-supported with completely private and anonymized ads matched on your device.",
value: "Brave News is ad-supported with completely private and anonymized ads matched on your device.",
comment: ""
)
public static let introCardNew = NSLocalizedString(
Expand All @@ -2041,7 +2041,7 @@ extension Strings {
public static let introCardNewTextBody = NSLocalizedString(
"today.introCardNewTextBody",
bundle: .braveShared,
value: "Customize Brave Today with up to 5 RSS feeds and get new content from your favorite publishers throughout the day.",
value: "Customize your feed using hundreds of leading content sources delivered through our private CDN, and add RSS feeds from your favorite publishers to make a feed that works just for you.",
comment: ""
)
public static let refresh = NSLocalizedString(
Expand Down Expand Up @@ -2107,7 +2107,7 @@ extension Strings {
public static let errorGeneralBody = NSLocalizedString(
"today.errorGeneralBody",
bundle: .braveShared,
value: "Brave Today is experiencing some issues. Try again.",
value: "Brave News is experiencing some issues. Try again.",
comment: ""
)
public static let disablePublisherContent = NSLocalizedString(
Expand All @@ -2131,13 +2131,13 @@ extension Strings {
public static let disabledAlertBody = NSLocalizedString(
"today.disabledAlertBody",
bundle: .braveShared,
value: "Brave Today will stop showing content from %@",
value: "Brave News will stop showing content from %@",
comment: "'%@' will turn into the name of a publisher (verbatim), for example: Brave Blog"
)
public static let isEnabledToggleLabel = NSLocalizedString(
"today.isEnabledToggleLabel",
bundle: .braveShared,
value: "Show Brave Today",
value: "Show Brave News",
comment: ""
)
public static let settingsSourceHeaderTitle = NSLocalizedString(
Expand Down Expand Up @@ -2179,7 +2179,7 @@ extension Strings {
public static let addSourceShareTitle = NSLocalizedString(
"today.addSourceShareTitle",
bundle: .braveShared,
value: "Add Source to Brave Today",
value: "Add Source to Brave News",
comment: "The action title displayed in the iOS share menu"
)
public static let addSourceFailureTitle = NSLocalizedString(
Expand Down Expand Up @@ -2212,24 +2212,6 @@ extension Strings {
value: "Add",
comment: "To add a list of 1 or more rss feeds"
)
public static let rssFeedLimitExceededAlertTitle = NSLocalizedString(
"today.rssFeedLimitExceededAlertTitle",
bundle: .braveShared,
value: "Feed limit exceeded",
comment: ""
)
public static let rssFeedLimitExceededAlertMessage = NSLocalizedString(
"today.rssFeedLimitExceededAlertMessage",
bundle: .braveShared,
value: "The free ad-supported version of Brave Today includes 5 RSS feeds. You can customize your feed selections from the Sources list.",
comment: ""
)
public static let rssFeedLimitRemainingFooter = NSLocalizedString(
"today.rssFeedLimitRemainingFooter",
bundle: .braveShared,
value: "You currently have %d RSS feeds in your Sources list. The free ad-supported version of Brave Today includes 5 RSS feeds. Support for unlimited feeds and OPML import will be coming soon. You can customize your feed selections from the Sources list.",
comment: "%d will be a number (i.e. 4)"
)
public static let insecureSourcesHeader = NSLocalizedString(
"today.insecureSourcesHeader",
bundle: .braveShared,
Expand Down
4 changes: 2 additions & 2 deletions BraveShared/BraveUX.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ public struct BraveUX {
public static let braveCommunityURL = URL(string: "https://community.brave.com/")!
public static let braveVPNFaqURL = URL(string: "https://support.brave.com/hc/en-us/articles/360045045952")!
public static let bravePrivacyURL = URL(string: "https://brave.com/privacy/")!
public static let braveTodayPrivacyURL = URL(string: "https://brave.com/privacy/#brave-today")!
public static let braveNewsPrivacyURL = URL(string: "https://brave.com/privacy/#brave-news")!
public static let braveOffersURL = URL(string: "https://offers.brave.com/")!
public static let braveRewardsLearnMoreURL = URL(string: "https://brave.com/rewards-ios/")!
public static let braveRewardsUnverifiedPublisherLearnMoreURL = URL(string: "https://brave.com/faq-rewards/#unclaimed-funds")!
public static let braveTodayPartnersURL = URL(string: "https://brave.com/brave-today/")!
public static let braveNewsPartnersURL = URL(string: "https://brave.com/brave-news/")!
public static let braveTermsOfUseURL = URL(string: "https://www.brave.com/terms_of_use")!
public static let ntpTutorialPageURL = URL(string: "https://brave.com/ja/ntp-tutorial")

Expand Down
2 changes: 1 addition & 1 deletion BraveShared/Preferences.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ extension Preferences {
public static let ntpCheckDate = Option<TimeInterval?>(key: "ntp.next-check-date", default: nil)
}

public final class BraveToday {
public final class BraveNews {
public static let isShowingOptIn = Option<Bool>(key: "brave-today.showing-opt-in", default: false)
public static let userOptedIn = Option<Bool>(key: "brave-today.user-opted-in", default: false)
public static let isEnabled = Option<Bool>(key: "brave-today.enabled", default: true)
Expand Down
Loading

0 comments on commit 4e48404

Please sign in to comment.