Merge remote-tracking branch 'origin/OpenOLAT_13.0'

src/main/java/org/olat/core/commons/services/webdav/servlets/RequestUtil.java

@@ -502,7 +502,8 @@ public final class RequestUtil {
     			default: sb.append(ch);
     		}
     	}
-    	return Normalizer.normalize(sb, Normalizer.Form.NFC);
+    	String normalized = Normalizer.normalize(sb, Normalizer.Form.NFC);
+    	return normalized.trim();
     }
 }
 

src/main/java/org/olat/course/config/ui/_content/course_options.html

@@ -2,5 +2,8 @@
 	<legend>$r.translate("details.options.title")</legend>
 	$r.render("glossary")
 	$r.render("sharedfolder")
+	#if($r.available("buttons"))
+		$r.render("buttons")
+	#end
 </fieldset>
 

src/main/java/org/olat/course/db/_i18n/LocalStrings_pt_BR.properties

-#Wed Nov 14 12:23:44 CET 2018
+#Fri Jan 04 19:25:23 CET 2019
 command.new_db=Criar novo banco de dados
 customDb.category=Nome
 customDb.create=Criar

src/main/java/org/olat/course/nodes/members/MembersPeekViewController.java

@@ -140,7 +140,7 @@ public class MembersPeekViewController extends BasicController {
 		MembersCourseNodeConfiguration nodeConfig = (MembersCourseNodeConfiguration)CourseNodeFactory.getInstance().getCourseNodeConfiguration("cmembers");
 		boolean deduplicateList = nodeConfig.isDeduplicateList();
 		
-		Predicate<Identity> deduplicatCatch = deduplicateList ? new Deduplicate() : new All();
+		Predicate<Identity> deduplicatCatch = new Deduplicate();
 		if(withOwners) {
 			List<Identity> filteredOwners = owners.stream()
 					.filter(deduplicatCatch)
@@ -149,6 +149,9 @@ public class MembersPeekViewController extends BasicController {
 		}
 
 		if(withCoaches) {
+			if(!deduplicateList) {
+				deduplicatCatch = new Deduplicate();
+			}
 			List<Identity> filteredCoaches = coaches.stream()
 					.filter(deduplicatCatch)
 					.collect(Collectors.toList());
@@ -156,6 +159,9 @@ public class MembersPeekViewController extends BasicController {
 		}
 
 		if(withParticipants) {
+			if(!deduplicateList) {
+				deduplicatCatch = new Deduplicate();
+			}
 			List<Identity> filteredParticipants = participants.stream()
 					.filter(deduplicatCatch)
 					.collect(Collectors.toList());
@@ -195,11 +201,4 @@ public class MembersPeekViewController extends BasicController {
 			return true;
 		}	
 	}
-	
-	private static class All implements Predicate<Identity> {
-		@Override
-		public boolean test(Identity t) {
-			return true;
-		}
-	}
 }

src/main/java/org/olat/modules/reminder/ui/_i18n/LocalStrings_pt_BR.properties

-#Thu Nov 23 17:14:29 CET 2017
+#Fri Jan 04 19:25:22 CET 2019
 admin.menu.title=Lembretes de curso
 admin.menu.title.alt=Lembretes de Curso
 after.validfrom=Ap\u00F3s o in\u00EDcio
@@ -20,6 +20,7 @@ interval.8=3 vezes ao dia
 reminder.admin.title=Lembretes de Curso
 reminder.from.course=Lembrete de curso {0}
 rule.after.date=Ap\u00F3s data
+rule.before.date=At\u00E9 data
 rule.course.enrollment.date=Data de inscri\u00E7\u00E3o
 rule.course.role=Fun\u00E7\u00E3o curso
 rule.group.member=Membro de grupo

src/test/java/org/olat/core/commons/services/webdav/servlets/RequestUtilsTest.java

@@ -19,8 +19,14 @@
  */
 package org.olat.core.commons.services.webdav.servlets;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
 /**
  * 
@@ -28,19 +34,30 @@ import org.junit.Test;
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  *
  */
+@RunWith(Parameterized.class)
 public class RequestUtilsTest {
 	
+	@Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {
+                { "Test", "Test" },
+                { "Test\u00E9\u00E4", "Test\u00E9\u00E4" },
+                { "%12 ?()_//", "_12 _()___" },
+                { " Test  ", "Test" }
+        });
+    }
+    
+    private String filename;
+    private String normalizedFilename;
+    
+	public RequestUtilsTest(String filename, String normalizedFilename) {
+		this.filename = filename;
+		this.normalizedFilename = normalizedFilename;
+	}
+	
 	@Test
 	public void testNormalizeFilename() {
-		String simpleFilename = RequestUtil.normalizeFilename("Test");
-		Assert.assertEquals("Test", simpleFilename);
-
-		String accentFilename = RequestUtil.normalizeFilename("Test\u00E9\u00E4");
-		Assert.assertEquals("Test\u00E9\u00E4", accentFilename);
-		
-		String moreSpecialChars = RequestUtil.normalizeFilename("%12 ?()_//");
-		Assert.assertEquals("_12 _()___", moreSpecialChars);
+		String correctedFilename = RequestUtil.normalizeFilename(filename);
+		Assert.assertEquals(normalizedFilename, correctedFilename);
 	}
-
-
 }