langgenius/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-07-21 20:15:31 -04:00
Code Issues 775 Packages Projects Releases 10 Wiki Activity

[PR #24615] feat: fix i18n missing keys and merge upstream/main #30712

New Issue
Closed
opened 2026-02-21 20:48:05 -05:00 by yindo · 0 comments
yindo commented 2026-02-21 20:48:05 -05:00
Owner
Copy Link
Copy Source

Original Pull Request: https://github.com/langgenius/dify/pull/24615

State: closed
Merged: Yes

Summary

This PR addresses missing i18n translation keys and successfully merges the latest upstream/main changes into the trigger branch.

🔧 Changes Made

I18n Fixes

  • Fixed missing translation keys:

    • workflow.common.runAllTriggers - "运行所有触发器" (zh-Hans), "すべてのトリガーを実行" (ja-JP)
    • workflow.nodes.triggerSchedule.onMinute - "分钟" (zh-Hans), "分" (ja-JP)
    • workflow.nodes.triggerSchedule.invalidOnMinute - "分钟必须在 0-59 之间" (zh-Hans), "分は0-59の間である必要があります" (ja-JP)

  • Removed extra translation key:

    • workflow.nodes.triggerSchedule.frequency.once - no longer needed in English version

Merge Resolution

  • Successfully merged upstream/main with comprehensive conflict resolution
  • Preserved trigger branch functionality - maintained all trigger-specific configurations
  • Enhanced infrastructure files:
    • api/docker/entrypoint.sh: Kept our edition-aware queue configuration and Kubernetes support
    • dev/start-worker: Preserved full CLI functionality with help documentation
    • web/i18n/ja-JP/common.ts: Merged both translation sets correctly

🚀 Technical Details

Merge Strategy Used

  • Careful conflict resolution prioritizing trigger functionality
  • Retained trigger-specific improvements:
    • Workflow queue support for community and cloud editions
    • Advanced worker configuration options
    • Complete i18n coverage

Key Files Updated

  • web/i18n/zh-Hans/workflow.ts: Added missing Chinese translations
  • web/i18n/ja-JP/workflow.ts: Added missing Japanese translations
  • web/i18n/ja-JP/common.ts: Resolved merge conflicts by keeping both translation sets

✅ Validation

  • I18n validation passed: pnpm check-i18n --file=workflow shows no missing keys
  • All tests passing: ESLint, unit tests, and linting checks complete
  • Functionality preserved: Trigger system maintains full compatibility
  • Infrastructure enhanced: Worker and deployment configurations improved

🔄 Merge Request

Please use REBASE merge strategy to maintain clean commit history. This PR includes:

  • Core i18n fixes (2 commits)
  • Upstream merge resolution (1 commit)
  • Translation improvements (1 commit)

The individual commits provide valuable context for future maintenance and debugging.

This ensures the trigger branch stays current with main while preserving all trigger-specific enhancements and completing i18n coverage.

**Original Pull Request:** https://github.com/langgenius/dify/pull/24615 **State:** closed **Merged:** Yes --- ## Summary This PR addresses missing i18n translation keys and successfully merges the latest upstream/main changes into the trigger branch. ### 🔧 Changes Made #### I18n Fixes - **Fixed missing translation keys**: - `workflow.common.runAllTriggers` - "运行所有触发器" (zh-Hans), "すべてのトリガーを実行" (ja-JP) - `workflow.nodes.triggerSchedule.onMinute` - "分钟" (zh-Hans), "分" (ja-JP) - `workflow.nodes.triggerSchedule.invalidOnMinute` - "分钟必须在 0-59 之间" (zh-Hans), "分は0-59の間である必要があります" (ja-JP) - **Removed extra translation key**: - `workflow.nodes.triggerSchedule.frequency.once` - no longer needed in English version #### Merge Resolution - **Successfully merged upstream/main** with comprehensive conflict resolution - **Preserved trigger branch functionality** - maintained all trigger-specific configurations - **Enhanced infrastructure files**: - `api/docker/entrypoint.sh`: Kept our edition-aware queue configuration and Kubernetes support - `dev/start-worker`: Preserved full CLI functionality with help documentation - `web/i18n/ja-JP/common.ts`: Merged both translation sets correctly ### 🚀 Technical Details #### Merge Strategy Used - **Careful conflict resolution** prioritizing trigger functionality - **Retained trigger-specific improvements**: - Workflow queue support for community and cloud editions - Advanced worker configuration options - Complete i18n coverage #### Key Files Updated - `web/i18n/zh-Hans/workflow.ts`: Added missing Chinese translations - `web/i18n/ja-JP/workflow.ts`: Added missing Japanese translations - `web/i18n/ja-JP/common.ts`: Resolved merge conflicts by keeping both translation sets ### ✅ Validation - **I18n validation passed**: `pnpm check-i18n --file=workflow` shows no missing keys - **All tests passing**: ESLint, unit tests, and linting checks complete - **Functionality preserved**: Trigger system maintains full compatibility - **Infrastructure enhanced**: Worker and deployment configurations improved ### 🔄 Merge Request **Please use REBASE merge strategy** to maintain clean commit history. This PR includes: - Core i18n fixes (2 commits) - Upstream merge resolution (1 commit) - Translation improvements (1 commit) The individual commits provide valuable context for future maintenance and debugging. --- This ensures the trigger branch stays current with main while preserving all trigger-specific enhancements and completing i18n coverage.
yindo added the pull-request label 2026-02-21 20:48:05 -05:00
yindo closed this issue 2026-02-21 20:48:05 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Knowledge Pipeline
Proposal
WIP
cloud
dependencies
feat:webapp
good first issue
outdated
performance
pull-request
Mirrored from GitHub Pull Request
 python:uv
refactor
size:L
stale
status: accepting prs
status: blocked
status: in discussion
stt & tts
vulnerablity
web
wont-fix
🌊 feat:workflow
🌚 invalid
🐞 bug
👻 feat:rag
💪 enhancement
📚 documentation
🔨 feat:tools
🙋‍♂️ question
🙏 help wanted
🤔 cant-reproduce
🤖 feat:agent
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
yindo
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: langgenius/dify#30712
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?