mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Vastly improved Estonian translation bundle (#737)

Browse Source 
* Minor user interface tweaks

* Vastly improved Estonian translation bundle
This commit is contained in:
Charlie Karniol 2019-10-15 06:48:25 +03:00 committed by Anuken
parent a4b6b88b76
commit fab3fcb112
6 changed files with 984 additions and 956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1924
core/assets/bundles/bundle_et.properties
View File

File diff suppressed because it is too large Load Diff

2
core/src/io/anuke/mindustry/editor/MapResizeDialog.java
View File

@ -46,7 +46,7 @@ public class MapResizeDialog extends FloatingDialog{
buttons.defaults().size(200f, 50f); buttons.defaults().size(200f, 50f);
buttons.addButton("$cancel", this::hide); buttons.addButton("$cancel", this::hide);
buttons.addButton("$editor.resize", () -> { buttons.addButton("$ok", () -> {
cons.accept(width, height); cons.accept(width, height);
hide(); hide();
}); });

6
core/src/io/anuke/mindustry/ui/Links.java
View File

@ -1,6 +1,7 @@
package io.anuke.mindustry.ui; package io.anuke.mindustry.ui;
import io.anuke.arc.Core; import io.anuke.arc.Core;
import io.anuke.arc.util.Strings;
import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Pal;
@ -29,7 +30,7 @@ public class Links{
} }
public static class LinkEntry{ public static class LinkEntry{
public final String name, description, link; public final String name, title, description, link;
public final Color color; public final Color color;
public LinkEntry(String name, String link, Color color){ public LinkEntry(String name, String link, Color color){
@ -37,6 +38,9 @@ public class Links{
this.color = color; this.color = color;
this.description = Core.bundle.getNotNull("link." + name + ".description"); this.description = Core.bundle.getNotNull("link." + name + ".description");
this.link = link; this.link = link;
String title = Core.bundle.getOrNull("link." + name + ".title");
this.title = title != null ? title : Strings.capitalize(name.replace("-", " "));
} }
} }
} }

2
core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
View File

@ -59,7 +59,7 @@ public class AboutDialog extends FloatingDialog{
}).size(h - 5, h); }).size(h - 5, h);
table.table(inset -> { table.table(inset -> {
inset.add("[accent]" + Strings.capitalize(link.name.replace("-", " "))).growX().left(); inset.add("[accent]" + link.title).growX().left();
inset.row(); inset.row();
inset.labelWrap(link.description).width(w - 100f).color(Color.lightGray).growX(); inset.labelWrap(link.description).width(w - 100f).color(Color.lightGray).growX();
}).padLeft(8); }).padLeft(8);

4
core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@ -157,14 +157,14 @@ public class CustomRulesDialog extends FloatingDialog{
main.row(); main.row();
title("$rules.title.player"); title("$rules.title.player");
number("$rules.playerdamagemultiplier", f -> rules.playerDamageMultiplier = f, () -> rules.playerDamageMultiplier);
number("$rules.playerhealthmultiplier", f -> rules.playerHealthMultiplier = f, () -> rules.playerHealthMultiplier); number("$rules.playerhealthmultiplier", f -> rules.playerHealthMultiplier = f, () -> rules.playerHealthMultiplier);
number("$rules.playerdamagemultiplier", f -> rules.playerDamageMultiplier = f, () -> rules.playerDamageMultiplier);
title("$rules.title.unit"); title("$rules.title.unit");
check("$rules.unitdrops", b -> rules.unitDrops = b, () -> rules.unitDrops, () -> true); check("$rules.unitdrops", b -> rules.unitDrops = b, () -> rules.unitDrops, () -> true);
number("$rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier);
number("$rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier); number("$rules.unithealthmultiplier", f -> rules.unitHealthMultiplier = f, () -> rules.unitHealthMultiplier);
number("$rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier); number("$rules.unitdamagemultiplier", f -> rules.unitDamageMultiplier = f, () -> rules.unitDamageMultiplier);
number("$rules.unitbuildspeedmultiplier", f -> rules.unitBuildSpeedMultiplier = f, () -> rules.unitBuildSpeedMultiplier);
title("$rules.title.enemy"); title("$rules.title.enemy");
check("$rules.attack", b -> rules.attackMode = b, () -> rules.attackMode); check("$rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);

2
core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java
View File

@ -157,7 +157,7 @@ public class ZoneInfoDialog extends FloatingDialog{
hide(); hide();
control.playZone(zone); control.playZone(zone);
} }
}).minWidth(150f).margin(13f).padTop(5).disabled(b -> zone.locked() ? !zone.canUnlock() : !data.hasItems(zone.getLaunchCost())).uniformY().get(); }).minWidth(200f).margin(13f).padTop(5).disabled(b -> zone.locked() ? !zone.canUnlock() : !data.hasItems(zone.getLaunchCost())).uniformY().get();
button.row(); button.row();
button.add(iteminfo); button.add(iteminfo);