From 9d7f5dd32a35e8a9d15e5b0c0e3798855359c051 Mon Sep 17 00:00:00 2001 From: sciwhiz12 Date: Thu, 9 Sep 2021 02:36:00 +0800 Subject: [PATCH] Add workaround for pairs of `'` being stripped (#8050) Fixes #7396, where if a translated string with balanced pairs of single quote characters passes through ForgeI18n, the quotes are stripped because of ExtendedMessageFormat. This is most notable in languages where `'` is used frequently, like Canadian French from the bug report. Note that unbalanced pairs cause an IllegalArgumentException in ExtendedMessageFormat, which means the message is not affected. --- .../TextComponentMessageFormatHandler.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/fmllegacy/TextComponentMessageFormatHandler.java b/src/main/java/net/minecraftforge/fmllegacy/TextComponentMessageFormatHandler.java index 2bf2c35b65..8da807afab 100644 --- a/src/main/java/net/minecraftforge/fmllegacy/TextComponentMessageFormatHandler.java +++ b/src/main/java/net/minecraftforge/fmllegacy/TextComponentMessageFormatHandler.java @@ -28,7 +28,19 @@ import java.util.List; public class TextComponentMessageFormatHandler { public static int handle(final TranslatableComponent parent, final List children, final Object[] formatArgs, final String format) { try { - TextComponent component = new TextComponent(ForgeI18n.parseFormat(format, formatArgs)); + final String formattedString = ForgeI18n.parseFormat(format, formatArgs); + + // See MinecraftForge/MinecraftForge#7396 + if (format.indexOf('\'') != -1) { + final boolean onlyMissingQuotes = format.chars() + .filter(ch -> formattedString.indexOf((char) ch) == -1) + .allMatch(ch -> ch == '\''); + if (onlyMissingQuotes) { + return 0; + } + } + + TextComponent component = new TextComponent(formattedString); component.getStyle().applyTo(parent.getStyle()); children.add(component); return format.length();