Fix TOP Transformer Translation (#1520)

GregTechCE · Mar 8, 2021 · 618fc29 · 618fc29
1 parent d7afd73
commit 618fc29
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java b/src/main/java/gregtech/integration/theoneprobe/provider/TransformerInfoProvider.java
@@ -35,21 +35,24 @@ protected void addProbeInfo(IEnergyContainer capability, IProbeInfo probeInfo, T
 
                 // Step Up/Step Down line
                 if (mteTransformer.isInverted()) {
-                    transformInfo = I18n.format("gregtech.top.transform_up",
-                        inputVoltageN, inputAmperage, outputVoltageN, outputAmperage);
+                    transformInfo = "{*gregtech.top.transform_up*} ";
                 } else {
-                    transformInfo = I18n.format("gregtech.top.transform_down",
-                        inputVoltageN, inputAmperage, outputVoltageN, outputAmperage);
+                    transformInfo = "{*gregtech.top.transform_down*} ";
                 }
+                transformInfo += inputVoltageN + " (" + inputAmperage + "A) -> "
+                               + outputVoltageN + " (" + outputAmperage + "A)";
                 horizontalPane.text(TextStyleClass.INFO + transformInfo);
 
                 // Input/Output side line
                 horizontalPane = probeInfo.vertical(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER));
                 if (capability.inputsEnergy(sideHit)) {
-                    transformInfo = I18n.format("gregtech.top.transform_input", inputVoltageN, inputAmperage);
+                    transformInfo = "{*gregtech.top.transform_input*} "
+                            + inputVoltageN + " (" + inputAmperage + "A)";
                     horizontalPane.text(TextStyleClass.INFO + transformInfo);
+
                 } else if(capability.outputsEnergy(sideHit)) {
-                    transformInfo = I18n.format("gregtech.top.transform_output", outputVoltageN, outputAmperage);
+                    transformInfo = "{*gregtech.top.transform_output*} "
+                            + outputVoltageN + " (" + outputAmperage + "A)";
                     horizontalPane.text(TextStyleClass.INFO + transformInfo);
                 }
             }

diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang
@@ -14,10 +14,10 @@ gregtech.top.energy_stored=Energy:
 gregtech.top.progress=Progress:
 gregtech.top.working_disabled=Working Disabled
 
-gregtech.top.transform_up=§cStep Up§r %s (%,dA) -> %s (%,dA)
-gregtech.top.transform_down=§aStep Down§r %s (%,dA) -> %s (%,dA)
-gregtech.top.transform_input=§6Input:§r %s (%,dA)
-gregtech.top.transform_output=§9Output:§r %s (%,dA)
+gregtech.top.transform_up=§cStep Up§r
+gregtech.top.transform_down=§aStep Down§r
+gregtech.top.transform_input=§6Input:§r
+gregtech.top.transform_output=§9Output:§r
 
 gregtech.top.fuel_burn=for
 gregtech.top.fuel_time=secs