From 00ee86a1b7bc859b050f5e129d8397341f2e82ff Mon Sep 17 00:00:00 2001 From: redloong Date: Fri, 11 Sep 2026 01:51:59 +0200 Subject: [PATCH] fix for bundle (#12621) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * new * Translate 'seconds' to '秒' in properties file --- core/assets/bundles/bundle.properties | 5 +---- core/assets/bundles/bundle_zh_CN.properties | 7 ++----- core/src/mindustry/logic/LStatements.java | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 15554a6932..f3103a29cc 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -3416,7 +3416,6 @@ name.token.height = height name.token.sides = sides name.token.radius = radius name.token.rotation = rotation -name.token.degrees = degrees name.token.image = image name.token.size = size name.token.align = align @@ -3454,7 +3453,6 @@ name.token.output = output name.token.if = if name.token.then = then name.token.else = else -name.token.sec = sec name.token.find = find name.token.group = group name.token.enemy = enemy? @@ -3473,7 +3471,6 @@ name.token.type = type name.token.get = get name.token.team = team name.token.angle = angle -name.token.rot = rot name.token.spawn = spawn name.token.-bullet = = bullet name.token.unit = unit @@ -3588,4 +3585,4 @@ name.token.explosions = explosions name.token.loops = loops name.token.movement = movement name.token.shoot = shoot -name.token.ui = UI +name.token.ui = UI \ No newline at end of file diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 0bb50edbfb..e23fc9075f 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -3410,7 +3410,6 @@ name.token.height = 高 name.token.sides = 边数 name.token.radius = 半径 name.token.rotation = 旋转 -name.token.degrees = 角度 name.token.image = 图像 name.token.size = 大小 name.token.align = 对齐 @@ -3448,7 +3447,6 @@ name.token.output = 排序并输出 name.token.if = 如果 name.token.then = 就 name.token.else = 否则 -name.token.sec = 秒 name.token.find = 搜寻 name.token.group = 类型 name.token.enemy = 是敌? @@ -3466,8 +3464,7 @@ name.token.-lookup = = 查找 name.token.type = 类型 name.token.get = 获取 name.token.team = 队伍 -name.token.angle = angle -name.token.rot = 旋转 +name.token.angle = 角度 name.token.spawn = 生成 name.token.-bullet = = 子弹 name.token.unit = 单位 @@ -3477,7 +3474,7 @@ name.token.natural = 自然 name.token.speed = 速度 name.token.level = 级别 name.token.duration = 持续时间 -name.token.seconds = seconds +name.token.seconds = 秒 name.token.shown = 显示 name.token.data = 数据 name.token.effect = 效果 diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 54c0aa4d82..24a59a27c2 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -231,7 +231,7 @@ public class LStatements{ fields(table, "y", y, v -> y = v); } case rotate -> { - fields(table, "degrees", p1, v -> p1 = v); + fields(table, "angle", p1, v -> p1 = v); } } } @@ -798,7 +798,7 @@ public class LStatements{ @Override public void build(Table table){ field(table, value, str -> value = str); - table.add(bundle("sec")); + table.add(bundle("seconds")); } @Override