Fixed logic localization PR issues

This commit is contained in:
Anuken
2026-09-10 11:43:51 -04:00
parent b3317f3d4d
commit ef5d3cb26b
4 changed files with 4 additions and 6 deletions

View File

@@ -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

View File

@@ -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(){

View File

@@ -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)));
}
}
});

View File

@@ -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);
}
}