Skip to content

Commit 16757b1

Browse files
Goldenfield192Goldenfield192
committed
i18n: add translation keys
1 parent 44e6e5c commit 16757b1

File tree

6 files changed

+43
-15
lines changed

6 files changed

+43
-15
lines changed

‎src/main/java/cam72cam/immersiverailroading/gui/AugmentFilterGUI.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,21 @@ public void init(IScreenBuilder screen) {
6363

6464
Function<Enum<?>, String> translate = e -> TextUtil.translate(e.toString());
6565

66-
stockDetectorMode = new Button(screen, xtop + xOffset, ytop + yOffset, "Stock Detect Mode: " + translate.apply(properties.stockDetectorMode)) {
66+
stockDetectorMode = new Button(screen, xtop + xOffset, ytop + yOffset, GuiText.SELECTOR_AUGMENT_DETECT + translate.apply(properties.stockDetectorMode)) {
6767
@Override
6868
public void onClick(Player.Hand hand) {
6969
properties.stockDetectorMode = next(properties.stockDetectorMode, Player.Hand.PRIMARY);
70-
stockDetectorMode.setText("Detecting: " + translate.apply(properties.stockDetectorMode));
70+
stockDetectorMode.setText(GuiText.SELECTOR_AUGMENT_DETECT + translate.apply(properties.stockDetectorMode));
7171
}
7272
};
7373
stockDetectorMode.setEnabled(this.augment == Augment.DETECTOR);
7474
yOffset += 25;
7575

76-
redstoneMode = new Button(screen, xtop + xOffset, ytop + yOffset, "Redstone Mode: " + translate.apply(properties.redstoneMode)) {
76+
redstoneMode = new Button(screen, xtop + xOffset, ytop + yOffset, GuiText.SELECTOR_AUGMENT_REDSTONE + translate.apply(properties.redstoneMode)) {
7777
@Override
7878
public void onClick(Player.Hand hand) {
7979
properties.redstoneMode = next(properties.redstoneMode, Player.Hand.PRIMARY);
80-
redstoneMode.setText("Redstone Mode: " + translate.apply(properties.redstoneMode));
80+
redstoneMode.setText(GuiText.SELECTOR_AUGMENT_REDSTONE + translate.apply(properties.redstoneMode));
8181
}
8282
};
8383
redstoneMode.setEnabled(this.augment == Augment.COUPLER
@@ -87,7 +87,7 @@ public void onClick(Player.Hand hand) {
8787
|| this.augment == Augment.FLUID_UNLOADER);
8888
yOffset += 25;
8989

90-
pushpull = new CheckBox(screen, xtop + xOffset, ytop + yOffset, "Enable Pushpull", properties.pushpull) {
90+
pushpull = new CheckBox(screen, xtop + xOffset, ytop + yOffset, GuiText.SELECTOR_AUGMENT_PUSHPULL.toString(), properties.pushpull) {
9191
@Override
9292
public void onClick(Player.Hand hand) {
9393
properties.pushpull = !properties.pushpull;
@@ -101,21 +101,21 @@ public void onClick(Player.Hand hand) {
101101
|| this.augment == Augment.FLUID_UNLOADER);
102102
yOffset += 15;
103103

104-
couplerMode = new Button(screen, xtop + xOffset, ytop + yOffset, "Coupler Mode: " + translate.apply(properties.couplerAugmentMode)) {
104+
couplerMode = new Button(screen, xtop + xOffset, ytop + yOffset, GuiText.SELECTOR_AUGMENT_COUPLER + translate.apply(properties.couplerAugmentMode)) {
105105
@Override
106106
public void onClick(Player.Hand hand) {
107107
properties.couplerAugmentMode = next(properties.couplerAugmentMode, Player.Hand.PRIMARY);
108-
couplerMode.setText("Coupler Mode: " + translate.apply(properties.couplerAugmentMode));
108+
couplerMode.setText(GuiText.SELECTOR_AUGMENT_COUPLER + translate.apply(properties.couplerAugmentMode));
109109
}
110110
};
111111
couplerMode.setEnabled(this.augment == Augment.COUPLER);
112112
yOffset += 25;
113113

114-
locoControlMode = new Button(screen, xtop + xOffset, ytop + yOffset, "Locomotive Control Mode: " + translate.apply(properties.locoControlMode)) {
114+
locoControlMode = new Button(screen, xtop + xOffset, ytop + yOffset, GuiText.SELECTOR_AUGMENT_CONTROL + translate.apply(properties.locoControlMode)) {
115115
@Override
116116
public void onClick(Player.Hand hand) {
117117
properties.locoControlMode = next(properties.locoControlMode, Player.Hand.PRIMARY);
118-
locoControlMode.setText("Locomotive Control Mode: " + translate.apply(properties.locoControlMode));
118+
locoControlMode.setText(GuiText.SELECTOR_AUGMENT_CONTROL + translate.apply(properties.locoControlMode));
119119
}
120120
};
121121
locoControlMode.setEnabled(this.augment == Augment.LOCO_CONTROL);
@@ -150,13 +150,13 @@ public void draw(IScreenBuilder builder, RenderState state) {
150150

151151
int xOffset = 100;
152152
int yOffset = 30;
153-
GUIHelpers.drawCenteredString("Current Augment: " + TextUtil.translate("item.immersiverailroading:item_augment." + this.augment.toString() + ".name"), xOffset, 10, 0xFFFFFFFF);
153+
GUIHelpers.drawCenteredString(GuiText.LABEL_CURRENT_AUGMENT + this.augment.toString(), xOffset, 10, 0xFFFFFFFF);
154154

155-
GUIHelpers.drawCenteredString("Included Tags", xOffset, yOffset, 0xFFFFFFFF);
155+
GUIHelpers.drawCenteredString(GuiText.LABEL_INCLUDED_TAG.toString(), xOffset, yOffset, 0xFFFFFFFF);
156156
includeTags.setText(properties.positiveFilter);
157157
yOffset+=40;
158158

159-
GUIHelpers.drawCenteredString("Excluded Tags", xOffset, yOffset, 0xFFFFFFFF);
159+
GUIHelpers.drawCenteredString(GuiText.LABEL_EXCLUDED_TAG.toString(), xOffset, yOffset, 0xFFFFFFFF);
160160
excludeTags.setText(properties.negativeFilter);
161161
}
162162

‎src/main/java/cam72cam/immersiverailroading/items/ItemRailAugment.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import cam72cam.mod.math.Vec3d;
1717
import cam72cam.mod.math.Vec3i;
1818
import cam72cam.mod.serialization.TagField;
19-
import cam72cam.mod.text.TextUtil;
2019
import cam72cam.mod.util.Facing;
2120
import cam72cam.mod.world.World;
2221

@@ -117,7 +116,7 @@ public List<String> getTooltip(ItemStack stack)
117116

118117
@Override
119118
public String getCustomName(ItemStack stack) {
120-
return TextUtil.translate("item.immersiverailroading:item_augment." + new Data(stack).augment.name() + ".name");
119+
return new Data(stack).augment.toString();
121120
}
122121

123122
public static class Data extends ItemDataSerializer {

‎src/main/java/cam72cam/immersiverailroading/library/Augment.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import cam72cam.mod.serialization.TagCompound;
66
import cam72cam.mod.serialization.TagField;
77
import cam72cam.mod.serialization.TagMapped;
8+
import cam72cam.mod.text.TextUtil;
89

910
public enum Augment {
1011
SPEED_RETARDER,
@@ -45,6 +46,11 @@ public Color color() {
4546
return Color.WHITE;
4647
}
4748

49+
@Override
50+
public String toString() {
51+
return TextUtil.translate("item.immersiverailroading:item_augment." + this.name().toLowerCase() + ".name");
52+
}
53+
4854
@TagMapped(PropertyMapper.class)
4955
public static class Properties {
5056
public static final Properties EMPTY = new Properties("", "",

‎src/main/java/cam72cam/immersiverailroading/library/GuiText.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ public enum GuiText {
2222
SELECTOR_TRACK("selector.track"),
2323
SELECTOR_TRANSFER_TABLE_ENTRY_COUNT("selector.transfer_table_entry_count"),
2424
SELECTOR_TRANSFER_TABLE_ENTRY_SPACING("selector.transfer_table_entry_spacing"),
25+
SELECTOR_AUGMENT_DETECT("selector.augment.detect"),
26+
SELECTOR_AUGMENT_REDSTONE("selector.augment.redstone"),
27+
SELECTOR_AUGMENT_PUSHPULL("selector.augment.pushpull"),
28+
SELECTOR_AUGMENT_COUPLER("selector.augment.coupler"),
29+
SELECTOR_AUGMENT_CONTROL("selector.augment.control"),
2530
SELECTOR_PLATE_TYPE("selector.plate_type"),
2631
SELECTOR_PLATE_BOILER("selector.plate_boiler"),
2732
SELECTOR_CAST_SINGLE("selector.cast_single"),
@@ -64,12 +69,17 @@ public enum GuiText {
6469
PAINT_BRUSH_MODE_TOOLTIP("item.paint_brush.mode"),
6570
PAINT_BRUSH_DESCRIPTION_TOOLTIP("item.paint_brush.description"),
6671

72+
LABEL_CURRENT_AUGMENT("label.current_augment"),
73+
LABEL_INCLUDED_TAG("label.included_tag"),
74+
LABEL_EXCLUDED_TAG("label.excluded tag"),
75+
6776
ON("overlay.on"),
6877
OFF("overlay.off"),
6978
NONE("none"),
7079
;
7180

72-
private String value;
81+
private final String value;
82+
7383
GuiText(String value) {
7484
this.value = value;
7585
}

‎src/main/resources/assets/immersiverailroading/lang/en_us.lang‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ gui.immersiverailroading:selector.cast_repeat=Repeat Casting
9090
gui.immersiverailroading:selector.paintbrush_random=Apply random variant
9191
gui.immersiverailroading:selector.paintbrush_apply_to_stock=Apply to single stock
9292
gui.immersiverailroading:selector.paintbrush_apply_to_train=Apply to whole train
93+
# Migrated from old detector translations which already contain "Detecting", don't need for this
94+
gui.immersiverailroading:selector.augment.detect=Current:
95+
gui.immersiverailroading:selector.augment.redstone=Redstone Mode:
96+
gui.immersiverailroading:selector.augment.pushpull=Pushpull
97+
gui.immersiverailroading:selector.augment.coupler=Coupler Mode:
98+
gui.immersiverailroading:selector.augment.control=Locomotive Control Mode:
9399

94100
gui.immersiverailroading:item.switch_key=Right-Click a switch to cycle between: [ locked straight, locked turn, unlocked ]. Redstone is ignored when locked!
95101
gui.immersiverailroading:item.switch_key.data=Last locked switch: %s in %s
@@ -129,6 +135,10 @@ gui.immersiverailroading:stock.modeler=Modeler: %s
129135
gui.immersiverailroading:stock.pack=Pack: %s
130136
gui.immersiverailroading:stock.tag=Tags: %s
131137

138+
gui.immersiverailroading:label.current_augment=Current Augment:
139+
gui.immersiverailroading:label.included_tag=Included Tags:
140+
gui.immersiverailroading:label.excluded_tag=Excluded Tags:
141+
132142
gui.immersiverailroading:overlay.on=On
133143
gui.immersiverailroading:overlay.off=Off
134144

‎src/main/resources/assets/immersiverailroading/rolling_stock/default/base.caml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
name = null # Required: Stock Name
33
modeler = "N/A" # Optional: Modeler Name
44
pack = "N/A" # Optional: Pack Name
5+
# tags: Optional, stock's tags used by augment/displayed as tooltip
6+
# tags: In CAML, specify this multiple times for multiple lines
7+
# tags: In JSON, specify this as ["tag#1", "tag#2", "etc..."]
58

69
# Model information
710
darken_model = 0 # Deprecated: legacy feature

0 commit comments

Comments
 (0)