Skip to content

fix: Lang setting reset on page transition #10523

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
yuki-takei merged 2 commits into from
Nov 25, 2025
Merged

fix: Lang setting reset on page transition #10523

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6392845
bugFix
miya Nov 19, 2025
7cd9d6e
Add TODO
miya Nov 25, 2025
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
16 changes: 12 additions & 4 deletions apps/app/src/pages/[[...path]]/server-side-props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,20 @@ export async function getServerSidePropsForInitial(
export async function getServerSidePropsForSameRoute(
context: GetServerSidePropsContext,
): Promise<GetServerSidePropsResult<Stage2EachProps>> {
// Get page data
const result = await getPageDataForSameRoute(context);
// -- TODO: ：https://redmine.weseek.co.jp/issues/174725
// Remove getServerSideI18nProps from getServerSidePropsForSameRoute for performance improvement
const [i18nPropsResult, pageDataResult] = await Promise.all([
getServerSideI18nProps(context, ['translation']),
getPageDataForSameRoute(context),
]);
Copy link
Member Author

@miya miya Nov 19, 2025

Choose a reason for hiding this comment

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

他の NextPage と同様にページ遷移毎に毎回 getPageDataForSameRoute を getServerSideI18nProps を実行するように修正

Admin

growi/apps/app/src/pages/admin/_shared/get-server-side-common-props.ts

Lines 42 to 45 in 6392845

const [commonInitialResult, i18nResult] = await Promise.all([
getServerSideCommonInitialProps(context),
getServerSideI18nProps(context, ['admin'], options),
]);

Copy link
Contributor

@yuki-takei yuki-takei Nov 20, 2025

Choose a reason for hiding this comment

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

getServerSideI18nProps のコストって低いのかな？
その結論付けがないまま安易に追加したくない

admin はページ遷移時のパフォーマンスを気にしないので安易に追加していいと思っている

もしコストが低いなら追加してOK、高い可能性があるなら言語変更した際はリロードを促すなどすればいいと思う


// -- TODO: persist activity

// const mergedProps = await mergedResult.props;
// await addActivity(context, getActivityAction(mergedProps));
return result;
const mergedResult = mergeGetServerSidePropsResults(
pageDataResult,
i18nPropsResult,
);

return mergedResult;
}
Loading