feat: 双语日记分栏显示 + 语言标签标准化（squash merge from PR #6）#7
Merged
Conversation
- 修改语言标签格式：从单一语言名称改为 'ZH + XX' 格式 - 前端双语分栏：左侧中文原版，右侧翻译版本 - 兼容旧日志格式，自动转换语言全称到短名称 - 完善代码注释和文档 - 包含2026-06-14日记条目的双语数据 Closes #6
Copilot created this pull request from a session on behalf of
CyberYui
June 15, 2026 02:38
View session
CyberYui
approved these changes
Jun 15, 2026
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
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.
PR #6 (
fix/language-display) could not merge cleanly due to conflicts inlogs/2026/06/2026-06-13.mdandweb/logs.jsoncaused by daily log commits tomainafter the branch diverged.Changes
Language tag standardization (
config.py,composer.py,web_exporter.py)ZH + XX(e.g.ZH + JP) replacing bare language namesLEGACY_LANGUAGE_NAMESmappingBilingual split-column display (
web/app.js,web/styles.css).bilingualCSS classData + conflict resolution (
web/logs.json,logs/2026/06/)2026-06-13.md: kept PR feat: 双语日记分栏显示 + 语言标签标准化 #6 bilingual format (discarded stalemainversion)2026-06-14.md: preserved frommain(added post-branch-cut); entry backfilled intoweb/logs.jsonwith bilingual fieldsBranch cleanup (already done)
8 stale/orphan branches deleted: all merged
copilot/*feature branches (PR #1–5) plus two unassociated orphans (fix-daily-check-in-issue,fix-daily-journal-submission).