Subject: [PATCH] 23418
---
Index: test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java b/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java
--- a/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java	(revision 18938)
+++ b/test/unit/org/openstreetmap/josm/testutils/annotations/I18n.java	(date 1705410469139)
@@ -50,10 +50,12 @@
 
         @Override
         public void afterEach(ExtensionContext context) {
-            if (!Locale.ENGLISH.equals(Locale.getDefault())) {
+            Locale original = org.openstreetmap.josm.tools.I18n.getOriginalLocale();
+            if (original == null) {
                 org.openstreetmap.josm.tools.I18n.set("en");
-                org.openstreetmap.josm.tools.I18n.set(org.openstreetmap.josm.tools.I18n.getOriginalLocale().getLanguage());
-                Locale.setDefault(Locale.ENGLISH);
+            } else if (!original.equals(Locale.getDefault())) {
+                org.openstreetmap.josm.tools.I18n.set(original.getLanguage());
+                Locale.setDefault(original);
             }
         }
     }