diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 592a92c8c0..f8048927ca 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -3127,7 +3127,6 @@ lenum.ban = Blocks or units that cannot be placed or built. lenum.unban = Unban a unit or block. lenum.musicvolume = Global music volume multiplier.\nClamped to [0, 1]. -# Implemented via the localizedName() method instruction.read = Read instruction.write = Write instruction.draw = Draw @@ -3410,7 +3409,6 @@ tilelayer.label.ore = ore tilelayer.label.block = block tilelayer.label.building = building -name.token.jump = Jump name.token.color = color name.token.width = width name.token.height = height diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java index 915841e889..a0d7c71dad 100644 --- a/core/src/mindustry/logic/LStatement.java +++ b/core/src/mindustry/logic/LStatement.java @@ -370,7 +370,7 @@ public abstract class LStatement{ public String localizedName(){ if(logicLocalization()) return Core.bundle.get("instruction." + statementKey(), name()); - return statementKey(); + return name(); } public String name(){ diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index bd2d70d38f..54c0aa4d82 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -964,7 +964,7 @@ public class LStatements{ table.add().growX(); table.add(new JumpButton(() -> dest, s -> dest = s, this.elem)).size(30).right().padRight(-8f); - String name = name(); + String name = localizedName(); //hack way of finding the title label... Core.app.post(() -> { @@ -972,7 +972,7 @@ public class LStatements{ if(table.parent != null){ Label title = table.parent.find("statement-name"); if(title != null){ - title.update(() -> title.setText((dest != null ? bundle(name) + " -> " + dest.index : bundle(name)))); + title.update(() -> title.setText((dest != null ? name + " -> " + dest.index : name))); } } }); diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index e360c22063..4d317988be 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -787,7 +787,7 @@ public class JoinDialog extends BaseDialog{ //not important return ""; }else{ - return Core.bundle.format("server.version", host.version, host.versionType); + return Core.bundle.format("server.version", host.version, "official".equals(host.versionType) ? "" : host.versionType); } }