Skip to content

Conversation

@KirCute
Copy link
Member

@KirCute KirCute commented Dec 30, 2025

Description / 描述

解决drivers.jsonsettings.json两个翻译文件总是被 bot 覆盖的问题。

Motivation and Context / 背景

How Has This Been Tested? / 测试

Checklist / 检查清单

  • I have read the CONTRIBUTING document.
    我已阅读 CONTRIBUTING 文档。
  • I have formatted my code with go fmt or prettier.
    我已使用 go fmtprettier 格式化提交的代码。
  • I have added appropriate labels to this PR (or mentioned needed labels in the description if lacking permissions).
    我已为此 PR 添加了适当的标签(如无权限或需要的标签不存在,请在描述中说明,管理员将后续处理)。
  • I have requested review from relevant code authors using the "Request review" feature when applicable.
    我已在适当情况下使用"Request review"功能请求相关代码作者进行审查。
  • I have updated the repository accordingly (If it’s needed).
    我已相应更新了相关仓库(若适用)。

@KirCute KirCute enabled auto-merge (squash) December 30, 2025 07:42
@KirCute KirCute disabled auto-merge December 30, 2025 07:43
@KirCute KirCute merged commit 2442e30 into OpenListTeam:main Dec 30, 2025
9 of 10 checks passed
@KirCute KirCute deleted the ci/merge-i18n branch December 30, 2025 07:43
@xrgzs xrgzs requested a review from Copilot December 30, 2025 10:08
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR addresses an issue where translation files (drivers.json and settings.json) were being completely overwritten by a bot. The solution implements a merge strategy that only syncs new fields from the generated data into existing translation files, preserving manually translated content.

Key Changes:

  • Replaced reflect.DeepEqual comparison with a custom mergeJson function that merges only new fields
  • Modified the write logic to save the merged oldData (with new fields added) instead of completely replacing with newData
  • Removed the unused reflect package import

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

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.

1 participant