Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Settings is now capitalized in panel tour #8198

Closed
wants to merge 1 commit into from
Closed

Settings is now capitalized in panel tour #8198

wants to merge 1 commit into from

Conversation

jasonrsadler
Copy link
Contributor

Resolves brave/brave-browser#14122

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan


  1. Start Brave with clean profile
  2. Click BAT in omnibar and go through tour to second page
  3. Verify 'Settings' is capitalized to be consistent with usages throughout other areas

cc @zenparsing @emerick

@jasonrsadler jasonrsadler changed the title Fixes brave/brave-browser#14122 Settings is now capitalized in panel tour Mar 9, 2021
@@ -15,8 +15,7 @@ import { Toggle } from '../../../../components/toggle'
import * as s from './style'

export const DynamicListContext = React.createContext<
Partial<{ setSize: (index: number, size: number) => void }>
>({})
Partial<{ setSize: (index: number, size: number) => void }>>({})
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was causing tslint error on win

@@ -29,7 +29,7 @@ export const localeStrings = {
onboardingPanelWelcomeHeader: 'Welcome to Brave Rewards!',
onboardingPanelWelcomeText: 'Brave Private Ads reward you with tokens to support content creators unlike traditional ads, all while keeping your personal information private.',
onboardingPanelAdsHeader: 'Where do ads show up?',
onboardingPanelAdsText: 'Brave Private Ads will appear as a normal notification. You control how often you see these ads in settings.',
onboardingPanelAdsText: 'Brave Private Ads will appear as a normal notification. You control how often you see these ads in Settings.',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For storybook

@@ -617,7 +617,7 @@
<message name="IDS_BRAVE_REWARDS_ONBOARDING_PANEL_WELCOME_HEADER" desc="">Welcome to Brave Rewards!</message>
<message name="IDS_BRAVE_REWARDS_ONBOARDING_PANEL_WELCOME_TEXT" desc="">Brave Private Ads reward you with tokens to support content creators unlike traditional ads, all while keeping your personal information private.</message>
<message name="IDS_BRAVE_REWARDS_ONBOARDING_PANEL_ADS_HEADER" desc="">Where do ads show up?</message>
<message name="IDS_BRAVE_REWARDS_ONBOARDING_PANEL_ADS_TEXT" desc="">Brave Private Ads will appear as a normal notification. You control how often you see these ads in settings.</message>
<message name="IDS_BRAVE_REWARDS_ONBOARDING_PANEL_ADS_TEXT" desc="">Brave Private Ads will appear as a normal notification. You control how often you see these ads in Settings.</message>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the string is pulled from grds but adding here if done in future.

@@ -1508,7 +1508,7 @@ until they verify, or until 90 days have passed.
Where do ads show up?
</message>
<message name="IDS_WHERE_DO_ADS_SHOW_UP_TEXT" desc="Brave rewards onboarding title">
Brave Private Ads will appear as a normal notification. You control how often you see these ads in settings.
Brave Private Ads will appear as a normal notification. You control how often you see these ads in Settings.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Android modification would need to be tested outside of PR. cc @SergeyZhukovsky

@stephendonner
Copy link
Contributor

Sorry for the delay @jasonrsadler @bsclifton - the changes look good to me, but given I haven't landed my own string fix correctly (yet - #8164), I'd feel better if someone else takes a closer look/r?s.

@bsclifton bsclifton requested a review from karenkliu March 12, 2021 07:02
@bsclifton
Copy link
Member

Adding @karenkliu - want to make sure capitalization for Settings is correct (there have been several casing issues lately) 😄

Copy link

@karenkliu karenkliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine... Not sure we have a hard rule about capitalizing settings. The one we need to watch for is making sure "Brave Private Ads" is always titlecased since it is a proper noun and needs the distinction.
Aside from that, our buttons on desktop should all be Sentence case.

@bsclifton
Copy link
Member

Closing as stale

@bsclifton bsclifton closed this Oct 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Settings" should be capitalized in Rewards tour, to match Welcome interstitial
4 participants