From edaafbb38ad068b7da9c8e8d6427e908273523a5 Mon Sep 17 00:00:00 2001 From: Ranzu <66495944+Ranzuu@users.noreply.github.com> Date: Thu, 2 Oct 2025 15:21:07 +0200 Subject: [PATCH] Make more Memory Card UI strings translatable (#38) (cherry picked from commit 47550d07df5686798dc616c313750c46642cea87) --- .../betterp2p/client/gui/GuiAdvancedMemoryCard.kt | 2 +- .../betterp2p/client/gui/InfoWrapper.kt | 12 +++--------- src/main/resources/assets/betterp2p/lang/en_US.lang | 2 ++ 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt index 0b7dcfc..f59f3e2 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt @@ -415,7 +415,7 @@ class GuiAdvancedMemoryCard(msg: S2COpenGui) : GuiScreen(), TextureBound { drawDefaultBackground() drawBackground() // Draw the stuff that resets GL state first - fontRendererObj.drawString(I18n.format("item.advanced_memory_card.name"), guiLeft + tableX, guiTop + 6, 0) + fontRendererObj.drawString(I18n.format("item.advanced_memory_card.name.gui"), guiLeft + tableX, guiTop + 6, 0) searchBar.drawTextBox() buttonList.forEach { it as WidgetButton it.draw(mc, mouseX, mouseY, partialTicks) diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/InfoWrapper.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/InfoWrapper.kt index ad661e5..6c81979 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/InfoWrapper.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/InfoWrapper.kt @@ -76,15 +76,9 @@ class InfoWrapper(info: P2PInfo) { val p2pType: ClientTunnelInfo = BetterP2P.proxy.getP2PFromIndex(info.type) as ClientTunnelInfo icon = p2pType.icon() overlay = p2pType.stack.iconIndex - description = buildString { - append("Type: ") - append(p2pType.dispName) - append(" - ") - if (output) - append(I18n.format("gui.advanced_memory_card.p2p_status.output")) - else - append(I18n.format("gui.advanced_memory_card.p2p_status.input")) - } + description = I18n.format("gui.advanced_memory_card.p2p_status.type", p2pType.dispName, + if (output) I18n.format("gui.advanced_memory_card.p2p_status.output") + else I18n.format("gui.advanced_memory_card.p2p_status.input")) val online = info.hasChannel hoverInfo = mutableListOf( "§bP2P - ${p2pType.dispName}", diff --git a/src/main/resources/assets/betterp2p/lang/en_US.lang b/src/main/resources/assets/betterp2p/lang/en_US.lang index 4a8a731..ba49765 100644 --- a/src/main/resources/assets/betterp2p/lang/en_US.lang +++ b/src/main/resources/assets/betterp2p/lang/en_US.lang @@ -1,4 +1,5 @@ item.advanced_memory_card.name=Advanced Memory Card +item.advanced_memory_card.name.gui=Advanced Memory Card item.advanced_memory_card.selected=Frequency: gui.advanced_memory_card.select=Select gui.advanced_memory_card.bind=Bind @@ -39,6 +40,7 @@ gui.advanced_memory_card.gui_scale.large=Current Size: Large gui.advanced_memory_card.gui_scale.dynamic=Current Size: Automatic gui.advanced_memory_card.p2p_status.bound=Bound gui.advanced_memory_card.p2p_status.unbound=Unbound +gui.advanced_memory_card.p2p_status.type=Type: %s - %s gui.advanced_memory_card.p2p_status.input=Input gui.advanced_memory_card.p2p_status.output=Output gui.advanced_memory_card.p2p_status.offline=Offline