已同步 2 个上游提交，提交 953f8b3ad 并推送。 - #5
Open
github-actions[bot] wants to merge 1 commit into
Open
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Push confirmed. Sync complete.
汇报
合并的上游提交（2 个）
3be6ed2cdfix(i18n): add unique keys to duplicate sidebar categories (fix(i18n): add unique keys to duplicate sidebar categories ionic-team/ionic-docs#4621)52829ef4ddocs(testing): add componentOnReady guidance and a Vue testing page (docs(testing): add componentOnReady guidance and a Vue testing page ionic-team/ionic-docs#4611)冲突处理（4 个文件）
docs/angular/testing.md— 保留中文翻译，新增「等待组件」小节翻译成中文，插在「服务」前docs/react/testing/unit-testing/best-practices.md— 保留中文翻译，末尾新增「等待组件」章节（翻译）sidebars.js— 保留中文标签「构建你的第一个应用」，采纳上游新增的key属性（angular/react/vue 三处）versioned_sidebars/version-v7-sidebars.json— 同上，保留中文本地化标签并添加key新增翻译
docs/vue/testing.md— 上游新增页面，已完整翻译成中文，并在 sidebars.js 中引入vue/testing（自动合并成功）验证：
npm install+npm run build（--locale zh）成功，生成build/vue/testing页面，无冲突标记残留。最终提交：
953f8b3ad（sync: 同步上游 2026-08-08，merge commit），已推送至origin/main。Triggered by scheduled workflow
opencode session | github run