From c19334fd450d539940e4b3350ea8be03ba3116bc Mon Sep 17 00:00:00 2001
From: JRoy <10731363+JRoy@users.noreply.github.com>
Date: Sun, 20 Jul 2025 11:21:07 -0700
Subject: [PATCH] Fix per-player locale for messages with arguments

---
 .../src/main/java/com/earth2me/essentials/I18n.java       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Essentials/src/main/java/com/earth2me/essentials/I18n.java b/Essentials/src/main/java/com/earth2me/essentials/I18n.java
index b09cb6712e0..246d46834ba 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/I18n.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/I18n.java
@@ -92,7 +92,7 @@ public static String tlLocale(final Locale locale, final String tlKey, final Obj
         if (objects.length == 0) {
             return NODOUBLEMARK.matcher(instance.translate(locale, tlKey)).replaceAll("'");
         } else {
-            return instance.format(tlKey, objects);
+            return instance.format(locale, tlKey, objects);
         }
     }
 
@@ -162,10 +162,6 @@ private String translate(final Locale locale, final String string) {
         }
     }
 
-    private String format(final String string, final Object... objects) {
-        return format(currentLocale, string, objects);
-    }
-
     private String format(final Locale locale, final String string, final Object... objects) {
         String format = translate(locale, string);
 
@@ -281,7 +277,7 @@ public InputStream getResourceAsStream(final String string) {
      * Reads .properties files as UTF-8 instead of ISO-8859-1, which is the default on Java 8/below.
      * Java 9 fixes this by defaulting to UTF-8 for .properties files.
      */
-    private static class UTF8PropertiesControl extends ResourceBundle.Control {
+    private static final class UTF8PropertiesControl extends ResourceBundle.Control {
         public ResourceBundle newBundle(final String baseName, final Locale locale, final String format, final ClassLoader loader, final boolean reload) throws IOException {
             final String resourceName = toResourceName(toBundleName(baseName, locale), "properties");
             ResourceBundle bundle = null;