Skip to content

repo sync #21304

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.

Sign up for GitHub

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

Merged
Octomerger merged 6 commits into from
Oct 12, 2022
Merged

repo sync #21304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57b153b
Merge branch 'main' into repo-sync
Octomerger Oct 12, 2022
61b6654
Merge pull request #31653 from github/repo-sync
Octomerger Oct 12, 2022
5dfca10
set max-age=0 when you want no cache (#31657)
Oct 12, 2022
b1a36fb
Revert "set max-age=0 when you want no cache (#31657)"
Ebonsignori Oct 12, 2022
c0f108e
Merge pull request #31658 from github/revert-31657-peterbe-2287-set-m…
Ebonsignori Oct 12, 2022
5beb76e
push locale when changing tabs (#31655)
Ebonsignori Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions components/article/PlatformPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ type Props = {
}
export const PlatformPicker = ({ variant = 'subnav' }: Props) => {
const router = useRouter()
const { query, asPath } = router
const { query, asPath, locale } = router
const { defaultPlatform, detectedPlatforms } = useArticleContext()
const [currentPlatform, setCurrentPlatform] = useState(defaultPlatform || '')

Expand Down Expand Up @@ -91,7 +91,10 @@ export const PlatformPicker = ({ variant = 'subnav' }: Props) => {
const [pathRoot, pathQuery = ''] = asPath.split('?')
const params = new URLSearchParams(pathQuery)
params.set(platformQueryKey, platform)
router.push({ pathname: pathRoot, query: params.toString() }, undefined, { shallow: true })
router.push({ pathname: pathRoot, query: params.toString() }, undefined, {
shallow: true,
locale,
})

sendEvent({
type: EventType.preference,
Expand Down
7 changes: 5 additions & 2 deletions components/article/ToolPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type Props = {
}
export const ToolPicker = ({ variant = 'subnav' }: Props) => {
const router = useRouter()
const { asPath, query } = router
const { asPath, query, locale } = router
// allTools comes from the ArticleContext which contains the list of tools available
const { defaultTool, detectedTools, allTools } = useArticleContext()
const [currentTool, setCurrentTool] = useState(getDefaultTool(defaultTool, detectedTools))
Expand Down Expand Up @@ -97,7 +97,10 @@ export const ToolPicker = ({ variant = 'subnav' }: Props) => {
const [pathRoot, pathQuery = ''] = asPath.split('?')
const params = new URLSearchParams(pathQuery)
params.set(toolQueryKey, tool)
router.push({ pathname: pathRoot, query: params.toString() }, undefined, { shallow: true })
router.push({ pathname: pathRoot, query: params.toString() }, undefined, {
shallow: true,
locale,
})

sendEvent({
type: EventType.preference,
Expand Down