diff --git a/src/main/java/org/olat/core/commons/services/help/ConfluenceHelper.java b/src/main/java/org/olat/core/commons/services/help/ConfluenceHelper.java index 8e189dcd2b0201ac8de7c7e149441e6b221587ac..f826f5edc3bbbe9e8697bfd59a12c1ae2281a18f 100644 --- a/src/main/java/org/olat/core/commons/services/help/ConfluenceHelper.java +++ b/src/main/java/org/olat/core/commons/services/help/ConfluenceHelper.java @@ -120,7 +120,8 @@ public class ConfluenceHelper { protected static final String generateSpace(String version, Locale locale) { StringBuilder sb = new StringBuilder(); sb.append("/OO"); - + + version = version.replace("pre", "0"); int firstPointIndex = version.indexOf('.'); if (firstPointIndex > 0) { sb.append(version.substring(0, firstPointIndex)); diff --git a/src/test/java/org/olat/core/commons/services/help/ConfluenceHelperTest.java b/src/test/java/org/olat/core/commons/services/help/ConfluenceHelperTest.java index cd53e477603c290fb9e323fa4332405e8b31c53b..8698b4cc71cffda874d5671e2254e0dd79bf9ed3 100644 --- a/src/test/java/org/olat/core/commons/services/help/ConfluenceHelperTest.java +++ b/src/test/java/org/olat/core/commons/services/help/ConfluenceHelperTest.java @@ -49,5 +49,17 @@ public class ConfluenceHelperTest { String url4 = ConfluenceHelper.generateSpace("11a", Locale.ENGLISH); Assert.assertNotNull(url4); Assert.assertTrue(url4.startsWith("/OO110EN/")); + + String url5pre0a = ConfluenceHelper.generateSpace("15.pre.0.a", Locale.ENGLISH); + Assert.assertNotNull(url5pre0a); + Assert.assertTrue(url5pre0a.startsWith("/OO150EN/")); + + String url15pre1 = ConfluenceHelper.generateSpace("15.pre.1", Locale.ENGLISH); + Assert.assertNotNull(url15pre1); + Assert.assertTrue(url15pre1.startsWith("/OO150EN/")); + + String url15pre = ConfluenceHelper.generateSpace("15.pre", Locale.ENGLISH); + Assert.assertNotNull(url15pre); + Assert.assertTrue(url15pre.startsWith("/OO150EN/")); } }