From 7dc17f843762da0edf870289eb1d065f5aeee853 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Mon, 27 Jul 2026 12:13:00 +0800 Subject: [PATCH] i18n: move bricks last in merge order for Tabular translation priority MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All business modules overwrite common keys (Submit/Reset/Cancel) with English→English, erasing bricks' zh translations. Moving bricks to end of merge priority ensures framework built-in strings always win. --- merge_i18n.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/merge_i18n.py b/merge_i18n.py index 37c981c7..24b02267 100644 --- a/merge_i18n.py +++ b/merge_i18n.py @@ -41,9 +41,9 @@ def parse_build_sh(build_sh_path): # 第二个 for m in 是 Sage 业务模块清单 modules_str = matches[1] modules = [m for m in modules_str.strip().split() if '-' not in m] - # sage → bricks → 业务模块(优先级递增,后者覆盖前者) + # 业务模块 → bricks(最后加载,优先级最高,确保框架内置文本不被覆盖) # bricks 是基础框架,不在 build.sh 业务模块循环中,需手动加入 - result = ['sage', 'bricks'] + modules + result = ['sage'] + modules + ['bricks'] return result