Merge OpenOLAT 12.1 to OpenOLAT branch default with 60d8417b97d9c869fcb6dcd35106904f3243c543

src/main/java/org/olat/group/ui/main/AbstractMemberListController.java

@@ -494,7 +494,7 @@ public abstract class AbstractMemberListController extends FormBasicController i
 			}
 			if(numOfRemovedOwner == 0 || numOfOwners - numOfRemovedOwner > 0) {
 				List<Identity> ids = securityManager.loadIdentityByKeys(identityKeys);
-				leaveDialogBox = new MemberLeaveConfirmationController(ureq, getWindowControl(), ids);
+				leaveDialogBox = new MemberLeaveConfirmationController(ureq, getWindowControl(), ids, repoEntry != null);
 				listenTo(leaveDialogBox);
 				
 				cmc = new CloseableModalController(getWindowControl(), translate("close"), leaveDialogBox.getInitialComponent(),

src/main/java/org/olat/group/ui/main/MemberLeaveConfirmationController.java

@@ -21,7 +21,6 @@ package org.olat.group.ui.main;
 
 import java.util.List;
 
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
@@ -34,6 +33,7 @@ import org.olat.core.id.Identity;
 import org.olat.core.util.StringHelper;
 import org.olat.group.BusinessGroupModule;
 import org.olat.user.UserManager;
+import org.springframework.beans.factory.annotation.Autowired;
 
 
 /**
@@ -48,14 +48,17 @@ public class MemberLeaveConfirmationController extends FormBasicController {
 	private final List<Identity> identities;
 	private MultipleSelectionElement mailEl;
 	
-	private final UserManager userManager;
-	private final BusinessGroupModule groupModule;
+	private final boolean withinCourse;
 	
-	public MemberLeaveConfirmationController(UserRequest ureq, WindowControl wControl, List<Identity> identities) {
+	@Autowired
+	private UserManager userManager;
+	@Autowired
+	private BusinessGroupModule groupModule;
+	
+	public MemberLeaveConfirmationController(UserRequest ureq, WindowControl wControl, List<Identity> identities, boolean withinCourse) {
 		super(ureq, wControl, "confirm_delete");
 		this.identities = identities;
-		userManager = CoreSpringFactory.getImpl(UserManager.class);
-		groupModule = CoreSpringFactory.getImpl(BusinessGroupModule.class);
+		this.withinCourse = withinCourse;
 		initForm(ureq);
 	}
 
@@ -65,6 +68,11 @@ public class MemberLeaveConfirmationController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		if(formLayout instanceof FormLayoutContainer) {
+			FormLayoutContainer layoutCont = (FormLayoutContainer)formLayout;
+			layoutCont.contextPut("withinCourse", withinCourse);
+		}
+		
 		if(identities != null && formLayout instanceof FormLayoutContainer) {
 			StringBuilder sb = new StringBuilder(identities.size() * 25);
 			for(Identity id:identities) {

src/main/java/org/olat/group/ui/main/_content/confirm_delete.html

-<p>$r.translate("dialog.modal.bg.remove.text",$identities)</p>
+#if($r.isTrue($withinCourse))
+	<p>$r.translate("dialog.modal.bg.remove.course.text",$identities)</p>		
+#else
+	<p>$r.translate("dialog.modal.bg.remove.text",$identities)</p>
+#end
 $r.render("options")
 $r.render("buttons")

src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties

@@ -16,6 +16,7 @@ dialog.modal.bg.delete.text=Wollen Sie die Gruppe "{0}" wirklich l\u00F6schen?
 dialog.modal.bg.mail.text=Wollen Sie die Mitglieder per Mail benachrichtigen?
 dialog.modal.bg.leave.text=Wenn Sie die Gruppe "{0}" verlassen, haben Sie keinen Zugang mehr.<br/> Wollen Sie die Gruppe wirklich verlassen?
 dialog.modal.bg.remove.text=Wollen Sie wirklich "{0}" aus dieser Gruppe entfernen?
+dialog.modal.bg.remove.course.text=Wollen Sie wirklich "{0}" aus diesem Kurs entfernen?
 dialog.modal.bg.send.mail=Wollen Sie die betroffene(n) Person(en) per E-Mail benachrichtigen?
 dialog.modal.bg.asktoleave.title=Anfrage Gruppe zu verlassen
 remove.send.mail=Benachrichtigung

src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties

@@ -35,6 +35,7 @@ dialog.modal.bg.delete.title=Delete group?
 dialog.modal.bg.leave.text=If you leave the group "{0}" you will no longer have access. <br>Do you really want to leave this group?<p>
 dialog.modal.bg.mail.text=Do you want to inform the members of this group by email?
 dialog.modal.bg.remove.text=Do you really want to remove these persons "{0}" from the group?
+dialog.modal.bg.remove.course.text=Do you really want to remove these persons "{0}" from the course?
 dialog.modal.bg.send.mail=Would you like to notify the respective members?
 edit.member=Edit membership
 edit.member.groups=Group memberships

src/main/java/org/olat/login/oauth/ui/OAuthAdminController.java

@@ -220,7 +220,7 @@ public class OAuthAdminController extends FormBasicController {
 		adfsApiKeyEl = uifactory.addTextElement("adfs.id", "adfs.api.id", 256, adfsApiKey, adfsCont);
 		String adfsApiSecret = oauthModule.getAdfsApiSecret();
 		adfsApiSecretEl = uifactory.addTextElement("adfs.secret", "adfs.api.secret", 256, adfsApiSecret, adfsCont);
-		adfsApiSecretEl.setHelpText("adfs.api.secret.hint");
+		adfsApiSecretEl.setHelpText(translate("adfs.api.secret.hint"));
 		
 		if(oauthModule.isAdfsEnabled()) {
 			adfsEl.select(keys[0], true);