Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 9598)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java (revision 9599)
@@ -409,5 +409,5 @@
// http://docs.oracle.com/javase/8/docs/technotes/guides/intl/enhancements.8.html#cldr
// FIXME: This can be removed after we switch to a minimal version of Java that enables CLDR by default
- // or includes all languages we need in the JRE. See http://openjdk.java.net/jeps/8043554 for Java 9
+ // or includes all languages we need in the JRE. See http://openjdk.java.net/jeps/252 for Java 9
Utils.updateSystemProperty("java.locale.providers", "JRE,CLDR");
Index: trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java (revision 9598)
+++ trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java (revision 9599)
@@ -95,4 +95,7 @@
@Test
public void testExplainChangesetClosedException() {
+ // This test relies on the fact that CLDR is not the default local provider (see I18n.init)
+ assertEquals("JRE,CLDR", System.getProperty("java.locale.providers"));
+
assertEquals("Failed to upload to changeset 0
because it has already been closed on ?.",
ExceptionUtil.explainChangesetClosedException(new ChangesetClosedException("")));
@@ -116,4 +119,7 @@
@Test
public void testExplainConflict() {
+ // This test relies on the fact that CLDR is not the default local provider (see I18n.init)
+ assertEquals("JRE,CLDR", System.getProperty("java.locale.providers"));
+
int code = HttpURLConnection.HTTP_CONFLICT;
assertEquals("The server reported that it has detected a conflict.",