Skip to content

Commit

Permalink
Merge pull request #9552 from brave/bsc-brave-talk-rename
Browse files Browse the repository at this point in the history
Rename Brave Together as Brave Talk on NTP (widget)
  • Loading branch information
bsclifton committed Aug 2, 2021
1 parent 8978a77 commit 5701eca
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
8 changes: 5 additions & 3 deletions .storybook/locale.ts
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ let locale: Record<string, string> = {
yourWallet: 'Your wallet',
// New Tab Page
adsTrackersBlocked: 'Ads and Trackers Blocked',
httpsUpgraded: 'HTTPS Upgrades',
estimatedBandwidthSaved: 'Bandwidth saved',
estimatedTimeSaved: 'Estimated Time Saved',
minutes: 'minutes',
photoBy: 'Photo by',
Expand All @@ -339,7 +339,7 @@ let locale: Record<string, string> = {
showBackgroundImg: 'Show background image',
showBraveStats: 'Show Brave Stats',
showBinance: 'Show Binance',
showTogether: 'Show Brave Together',
togetherWidgetTitle: 'Brave Talk',
showClock: 'Show Clock',
showTopSites: 'Show Top Sites',
showRewards: 'Show Rewards',
Expand All @@ -349,7 +349,9 @@ let locale: Record<string, string> = {
braveTodayIntroTitle: `Today's top stories in a completely private feed, just for you.`,
braveTodayIntroDescription: `Brave News is ad-supported with completely private and anonymized ads matched on your device. Your personal information always stays private, per our $1privacy policy$2.`,
braveTodayOptInActionLabel: 'Show Brave News',
braveTodayOptOutActionLabel: 'No thanks'
braveTodayOptOutActionLabel: 'No thanks',
braveTodayScrollHint: 'Scroll for Brave News',
editCardsTitle: 'Edit Cards'
}

export function provideStrings (strings: Record<string, string>) {
Expand Down
1 change: 0 additions & 1 deletion browser/ui/webui/brave_webui_source.cc
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ void CustomizeWebUIHTMLSource(const std::string &name,
{ "showFavoritesMenuLabel", IDS_BRAVE_NEW_TAB_SHOW_FAVORITES_MENU_LABEL }, // NOLINT
{ "showRewards", IDS_BRAVE_NEW_TAB_SHOW_REWARDS },
{ "showBinance", IDS_BRAVE_NEW_TAB_SHOW_BINANCE },
{ "showTogether", IDS_BRAVE_NEW_TAB_SHOW_TOGETHER },
{ "cards", IDS_BRAVE_NEW_TAB_SHOW_CARDS },
{ "brandedWallpaperOptIn", IDS_BRAVE_NEW_TAB_BRANDED_WALLPAPER_OPT_IN },
{ "topSitesTitle", IDS_BRAVE_NEW_TAB_TOP_SITES },
Expand Down
4 changes: 2 additions & 2 deletions common/extensions/api/brave_together.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[
{
"namespace": "braveTogether",
"description": "Use the <code>chrome.braveTogether</code> API to to receive info pertaining to the Brave Together feature.",
"description": "Use the <code>chrome.braveTogether</code> API to to receive info pertaining to the Brave Talk feature.",
"compiler_options": {
"implemented_in": "brave/browser/extensions/api/brave_together_api.h"
},
Expand All @@ -15,7 +15,7 @@
{
"name": "isSupported",
"type": "function",
"description": "Fetches whether or not Brave Together is supported",
"description": "Fetches whether or not Brave Talk is supported",
"parameters": [
{
"type": "function",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
ToggleCardsSwitch,
ToggleCardsText
} from '../../../components/default'
import togetherBanner from './assets/bravetogether.png'
import togetherBanner from './assets/brave-talk.png'
import binanceBanner from './assets/binance.png'
import rewardsBanner from './assets/braverewards.png'
import geminiBanner from './assets/gemini.png'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ export const getNewTabData = (state: NewTab.State = defaultState): NewTab.State
customLinksEnabled: boolean('CustomLinks Enabled?', false),
showBackgroundImage: boolean('Show background image?', true),
showStats: boolean('Show stats?', true),
showToday: boolean('Show today?', true),
showToday: boolean('Show Brave News?', true),
showClock: boolean('Show clock?', true),
showTopSites: boolean('Show top sites?', true),
showRewards: boolean('Show rewards?', true),
showTogether: boolean('Show together?', true),
togetherSupported: boolean('Together supported?', true),
togetherPromptDismissed: !boolean('Together prompt?', false),
showTogether: boolean('Show Brave Talk?', true),
togetherSupported: boolean('Brave Talk supported?', true),
togetherPromptDismissed: !boolean('Brave Talk prompt?', false),
geminiSupported: boolean('Gemini Supported?', true),
cryptoDotComSupported: boolean('Crypto.com supported?', true),
ftxSupported: boolean('FTX supported?', true),
Expand Down
2 changes: 1 addition & 1 deletion components/brave_together/browser/regions.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace brave_together {

// Brave Together is supported for all :)
// Brave Talk is supported for all :)
const std::vector<std::string> unsupported_regions = {
};

Expand Down
11 changes: 5 additions & 6 deletions components/resources/brave_components_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@

<message name="IDS_BRAVE_NEW_TAB_SHOW_REWARDS" desc="Text for settings show rewards option">Show Brave Rewards</message>
<message name="IDS_BRAVE_NEW_TAB_SHOW_BINANCE" desc="Text for show binance option">Show Binance</message>
<message name="IDS_BRAVE_NEW_TAB_SHOW_TOGETHER" desc="Text for show together option">Brave Together</message>
<message name="IDS_BRAVE_NEW_TAB_SHOW_CARDS" desc="Text for cards option">Cards</message>
<message name="IDS_BRAVE_NEW_TAB_BRANDED_WALLPAPER_OPT_IN" desc="Text for setting to opt-in to Branded Wallpapers on New Tab Page">Show Sponsored Images</message>
<message name="IDS_BRAVE_NEW_TAB_TOP_SITES" desc="Top Sites title">top sites</message>
Expand All @@ -233,13 +232,13 @@
Back
</message>

<message name="IDS_BRAVE_TOGETHER_PROMPT_TITLE" desc="Title for prompt about Brave Together">
<message name="IDS_BRAVE_TOGETHER_PROMPT_TITLE" desc="Title for prompt about Brave Talk">
You can start a private call in Brave.
</message>
<message name="IDS_BRAVE_TOGETHER_PROMPT_DESCRIPTION" desc="Description for prompt about Brave Together">
<message name="IDS_BRAVE_TOGETHER_PROMPT_DESCRIPTION" desc="Description for prompt about Brave Talk">
Start unlimited calls with friends and colleagues in Brave Talk.
</message>
<message name="IDS_BRAVE_TOGETHER_PROMPT_ACTION" desc="Button text for prompt about Brave Together">
<message name="IDS_BRAVE_TOGETHER_PROMPT_ACTION" desc="Button text for prompt about Brave Talk">
Try it out
</message>

Expand Down Expand Up @@ -303,7 +302,7 @@
<message name="IDS_BRAVE_NEW_TAB_CARDS_DESC" desc="Toggle cards description">By turning off Cards, all cards currently visible will be hidden. However, you may still be notified of new cards.</message>

<if expr="enable_sidebar">
<message name="IDS_SIDEBAR_BRAVE_TALK_ITEM_TITLE" desc="Title for brave together item in sidebar">
<message name="IDS_SIDEBAR_BRAVE_TALK_ITEM_TITLE" desc="Title for Brave Talk item in sidebar">
Brave Talk
</message>
<message name="IDS_SIDEBAR_WALLET_ITEM_TITLE" desc="Title for crypto wallet item in sidebar">
Expand Down Expand Up @@ -1013,7 +1012,7 @@
<message name="IDS_EDIT_CARDS_TITLE" desc="">Edit Cards</message>
<message name="IDS_REWARDS_WIDGET_TOS_AND_PP" desc="">By clicking [[title]], you agree to the <ph name="BEGIN_LINK1">$1</ph>Terms of Service<ph name="END_LINK1">$2</ph> and <ph name="BEGIN_LINK2">$3</ph>Privacy Policy<ph name="END_LINK2">$4</ph>.</message>
<message name="IDS_REWARDS_WIDGET_START_USING" desc="">Start using Brave Rewards</message>
<message name="IDS_TOGETHER_WIDGET_TITLE" desc="">Brave Together</message>
<message name="IDS_TOGETHER_WIDGET_TITLE" desc="">Brave Talk</message>
<message name="IDS_TOGETHER_WIDGET_WELCOME_TITLE" desc="">Start a private video call with your friends and colleagues.</message>
<message name="IDS_TOGETHER_WIDGET_START_BUTTON" desc="">Start video call</message>
<message name="IDS_TOGETHER_WIDGET_ABOUT_DATA" desc="">About your data</message>
Expand Down

0 comments on commit 5701eca

Please sign in to comment.