diff --git a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
index 7dce181ea3049890b6422f07b36b558a1949bfc1..0e30a5212c80bcf1441abb2382062229a35b5fa1 100644
--- a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
+++ b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
@@ -849,12 +849,17 @@ public class MailManagerImpl implements MailManager, InitializingBean {
*/
protected void evaluate(Context context, String template, StringWriter writer, MailerResult mailerResult) {
try {
- boolean result = velocityEngine.evaluate(context, writer, "mailTemplate", template);
- if (result) {
- mailerResult.setReturnCode(MailerResult.OK);
+ if(StringHelper.containsNonWhitespace(template)) {
+ boolean result = velocityEngine.evaluate(context, writer, "mailTemplate", template);
+ if (result) {
+ mailerResult.setReturnCode(MailerResult.OK);
+ } else {
+ log.warn("can't send email from user template with no reason");
+ mailerResult.setReturnCode(MailerResult.TEMPLATE_GENERAL_ERROR);
+ }
} else {
- log.warn("can't send email from user template with no reason");
- mailerResult.setReturnCode(MailerResult.TEMPLATE_GENERAL_ERROR);
+ // template is empty
+ mailerResult.setReturnCode(MailerResult.OK);
}
} catch (ParseErrorException e) {
log.warn("can't send email from user template", e);
diff --git a/src/main/java/org/olat/course/nodes/DialogCourseNode.java b/src/main/java/org/olat/course/nodes/DialogCourseNode.java
index 847cec0a39bb4848af6dc1710118e5d5a69eba1e..eeab60a82d5ad383b9f72744a00fd2a35c1c5a83 100644
--- a/src/main/java/org/olat/course/nodes/DialogCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/DialogCourseNode.java
@@ -57,7 +57,6 @@ import org.olat.course.editor.StatusDescription;
import org.olat.course.export.CourseEnvironmentMapper;
import org.olat.course.nodes.dialog.DialogElement;
import org.olat.course.nodes.dialog.DialogElementsManager;
-import org.olat.course.nodes.dialog.ui.DialogConfigForm;
import org.olat.course.nodes.dialog.ui.DialogCourseNodeEditController;
import org.olat.course.nodes.dialog.ui.DialogCourseNodeRunController;
import org.olat.course.run.navigation.NodeRunConstructionResult;
@@ -147,7 +146,6 @@ public class DialogCourseNode extends AbstractAccessableCourseNode {
// use defaults for new course building blocks
//REVIEW:pb version should go to 2 now and the handling for 1er should be to remove
config.setConfigurationVersion(1);
- config.set(DialogConfigForm.DIALOG_CONFIG_INTEGRATION, DialogConfigForm.CONFIG_INTEGRATION_VALUE_INLINE);
}
}
diff --git a/src/main/java/org/olat/course/nodes/dialog/ui/DialogConfigForm.java b/src/main/java/org/olat/course/nodes/dialog/ui/DialogConfigForm.java
deleted file mode 100644
index 0e42f37bd86ae5fb39c014abb043f1701fa31697..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/course/nodes/dialog/ui/DialogConfigForm.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-
-package org.olat.course.nodes.dialog.ui;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.form.flexible.FormItem;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.elements.SelectionElement;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.components.form.flexible.impl.FormEvent;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.logging.AssertException;
-import org.olat.core.util.Util;
-import org.olat.course.nodes.dialog.DialogElementsManager;
-import org.olat.modules.ModuleConfiguration;
-
-/**
- * Initial Date: 08.11.2005 <br>
- *
- * @author guido
- */
-public class DialogConfigForm extends FormBasicController {
-
- public static final String DIALOG_CONFIG_INTEGRATION = "dialog_integration";
- /** Integration configuration value: integrate it into course showing the course menu **/
- public static final String CONFIG_INTEGRATION_VALUE_INLINE = "inline";
- /** Integration configuration value: integrate it using a modal dialog withoud course menu **/
- public static final String CONFIG_INTEGRATION_VALUE_MODAL = "modal";
- /** Integration configuration value: integrate it as a pop up window **/
- public static final String CONFIG_INTEGRATION_VALUE_POPUP = "popup";
-
- private SelectionElement select;
-
- private final ModuleConfiguration config;
-
- /**
- * @param name
- * @param config the ModuleConfiguration
- * @param translator
- */
- public DialogConfigForm(UserRequest ureq, WindowControl wControl, ModuleConfiguration config) {
- super(ureq, wControl);
- setTranslator(Util.createPackageTranslator(DialogElementsManager.class, getLocale()));
- this.config = config;
- initForm(ureq);
- }
-
- @Override
- protected void formInnerEvent (UserRequest ureq, FormItem source, FormEvent event) {
- config.set(DialogConfigForm.DIALOG_CONFIG_INTEGRATION, select.isSelected(0) ? CONFIG_INTEGRATION_VALUE_POPUP : CONFIG_INTEGRATION_VALUE_INLINE);
- config.setConfigurationVersion(1);
- fireEvent (ureq, Event.CHANGED_EVENT);
- }
-
- @Override
- protected void formOK(UserRequest ureq) {
- //
- }
-
- @Override
- protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-
- if (config == null) throw new AssertException("module configuration is null!");
-
- select = uifactory.addCheckboxesHorizontal(
- "forumAsPopup", "selection.forumAsPopup.label",
- formLayout, new String[]{"xx"}, new String[]{null});
-
- String selectConfig = (String) config.get(DialogConfigForm.DIALOG_CONFIG_INTEGRATION);
- select.select ("xx", selectConfig == CONFIG_INTEGRATION_VALUE_POPUP);
- select.addActionListener(FormEvent.ONCLICK);
- }
-
- @Override
- protected void doDispose() {
- //
- }
-}
diff --git a/src/main/java/org/olat/course/nodes/dialog/ui/DialogElementsEditController.java b/src/main/java/org/olat/course/nodes/dialog/ui/DialogElementsEditController.java
index c7979877b5f32c65dad761e7860dce9d168e6c3e..b102cbb1f573d7c6faa5ae27bb7b7395a93de818 100644
--- a/src/main/java/org/olat/course/nodes/dialog/ui/DialogElementsEditController.java
+++ b/src/main/java/org/olat/course/nodes/dialog/ui/DialogElementsEditController.java
@@ -65,7 +65,6 @@ public class DialogElementsEditController extends BasicController {
private final Link uploadButton;
private final VelocityContainer mainVC;
- private DialogConfigForm configForumLaunch;
private FileUploadController fileUplCtr;
private CloseableModalController cmc;
private DialogElementListEditController elementListCtrl;
@@ -91,10 +90,6 @@ public class DialogElementsEditController extends BasicController {
uploadButton.setIconLeftCSS("o_icon o_icon-fw o_icon_upload");
uploadButton.setElementCssClass("o_sel_dialog_upload");
- configForumLaunch = new DialogConfigForm(ureq, getWindowControl(), courseNode.getModuleConfiguration());
- listenTo(configForumLaunch);
- mainVC.put("showForumAsPopupConfigForm", configForumLaunch.getInitialComponent());
-
elementListCtrl = new DialogElementListEditController(ureq, getWindowControl(), entry, courseNode);
listenTo(elementListCtrl);
mainVC.put("dialogElementsTable", elementListCtrl.getInitialComponent());
@@ -116,9 +111,7 @@ public class DialogElementsEditController extends BasicController {
@Override
protected void event(UserRequest ureq, Controller source, Event event) {
- if(configForumLaunch == source) {
- fireEvent(ureq, event);
- } else if (source == fileUplCtr) {
+ if (source == fileUplCtr) {
if (event == Event.DONE_EVENT || event == Event.CANCELLED_EVENT) {
elementListCtrl.loadModel();
} else if (event.getCommand().equals(FolderEvent.UPLOAD_EVENT)) {
diff --git a/src/main/java/org/olat/course/nodes/portfolio/PortfolioConfigForm.java b/src/main/java/org/olat/course/nodes/portfolio/PortfolioConfigForm.java
index 19f1289cf378f65c7f8fdd35b53ef50db68e1e84..164745f3a68400bfd0edcb6b5c2e46348d2e046b 100644
--- a/src/main/java/org/olat/course/nodes/portfolio/PortfolioConfigForm.java
+++ b/src/main/java/org/olat/course/nodes/portfolio/PortfolioConfigForm.java
@@ -159,7 +159,6 @@ public class PortfolioConfigForm extends FormBasicController {
changeMapLink.setElementCssClass("o_sel_map_change_repofile");
editMapLink = uifactory.addFormLink("edit.map", buttonGroupLayout, Link.BUTTON);
editMapLink.setElementCssClass("o_sel_edit_map");
- editMapLink.setTitle("Hello world edit");
chooseMapLink.setVisible(map == null && binder == null);
chooseMapLink.setEnabled(!inUse);
diff --git a/src/main/java/org/olat/ims/qti21/questionimport/CSVToAssessmentItemConverter.java b/src/main/java/org/olat/ims/qti21/questionimport/CSVToAssessmentItemConverter.java
index 6983ba7c3686161616e5b0b81c314bae51777867..c08886894c27ed9b401f1f95ee03fcd5e0ead445 100644
--- a/src/main/java/org/olat/ims/qti21/questionimport/CSVToAssessmentItemConverter.java
+++ b/src/main/java/org/olat/ims/qti21/questionimport/CSVToAssessmentItemConverter.java
@@ -684,20 +684,22 @@ public class CSVToAssessmentItemConverter {
}
private void processChoice_smc(String[] parts, SimpleChoiceAssessmentItemBuilder choiceBuilder) {
- double point = parseFloat(parts[0], 1.0f);
- String content = parts[1];
-
- ChoiceInteraction interaction = choiceBuilder.getChoiceInteraction();
- SimpleChoice newChoice = AssessmentItemFactory
- .createSimpleChoice(interaction, content, choiceBuilder.getQuestionType().getPrefix());
- choiceBuilder.addSimpleChoice(newChoice);
- choiceBuilder.setMapping(newChoice.getIdentifier(), point);
-
- if(point > 0.0) {
- if (choiceBuilder instanceof MultipleChoiceAssessmentItemBuilder) {
- ((MultipleChoiceAssessmentItemBuilder)choiceBuilder).addCorrectAnswer(newChoice.getIdentifier());
- } else {
- ((SingleChoiceAssessmentItemBuilder)choiceBuilder).setCorrectAnswer(newChoice.getIdentifier());
+ if(StringHelper.containsNonWhitespace(parts[0])) {
+ double point = parseFloat(parts[0], 1.0f);
+ String content = parts[1];
+
+ ChoiceInteraction interaction = choiceBuilder.getChoiceInteraction();
+ SimpleChoice newChoice = AssessmentItemFactory
+ .createSimpleChoice(interaction, content, choiceBuilder.getQuestionType().getPrefix());
+ choiceBuilder.addSimpleChoice(newChoice);
+ choiceBuilder.setMapping(newChoice.getIdentifier(), point);
+
+ if(point > 0.0) {
+ if (choiceBuilder instanceof MultipleChoiceAssessmentItemBuilder) {
+ ((MultipleChoiceAssessmentItemBuilder)choiceBuilder).addCorrectAnswer(newChoice.getIdentifier());
+ } else {
+ ((SingleChoiceAssessmentItemBuilder)choiceBuilder).setCorrectAnswer(newChoice.getIdentifier());
+ }
}
}
}
@@ -740,7 +742,7 @@ public class CSVToAssessmentItemConverter {
questionFragements = new ArrayList<>();
}
questionFragements.add(text);
- } else {
+ } else if(StringHelper.containsNonWhitespace(parts[0])) {
double score = parseFloat(parts[0], 1.0f);
String correctBlank = parts[1];
String responseId = fibBuilder.generateResponseIdentifier();
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
index f940198c1454567f4bcad7739c0d7b19f134adaa..46cde4ff5276fddf0bdad7c169dd7366d1d7322e 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
@@ -59,6 +59,7 @@ essay.max.strings=Max Anzahl W\u00F6rter
essay.min.strings=Min Anzahl W\u00F6rter
essay.rows=H\u00F6he (Anzahl Zeilen)
export.qpool.successful=$org.olat.ims.qti.editor\:export.qpool.successful
+feedback.additional.help=Feedback mit eigenen Bedingungen.
feedback.answered.help=Feedback bei Antwort\: Dieses Feedback erscheint sobald der Benutzer eine Antwort gibt.
feedback.correct.help=Feedback bei Wahl aller korrekten Antworten\: Dieses Feedback erscheint nur dann, wenn alle Antworten korrekt sind.
feedback.correct.single.help=Feedback bei Wahl der korrekten Antwort\: Dieses Feedback erscheint nur dann, wenn die Antwort korrekt sind.
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
index 39055cfd0125b7b061475e64972ecd796fa454b2..b932152ff6a7366e580aac880bc02d5b9e2fc2bd 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
@@ -59,6 +59,7 @@ essay.max.strings=Max. words
essay.min.strings=Min. words
essay.rows=Height (number of lines)
export.qpool.successful=$org.olat.ims.qti.editor\:export.qpool.successful
+feedback.additional.help=Feedback with their own configurable conditions.
feedback.answered.help=Feedback by answer\: this feedback is shown automatically if the user give an answer.
feedback.correct.help=Feedback for all correct answers\: The feedback appears only if all answer are correct.
feedback.correct.single.help=Feedback for correct answer\: this feedback appears only if the answer is correct.
diff --git a/src/main/java/org/olat/modules/ceditor/ui/TitleEditorController.java b/src/main/java/org/olat/modules/ceditor/ui/TitleEditorController.java
index 12ff7f7b91d8f52be5d3dba0c16bea3545b33747..6f76e267e9c12315c5820551e3104e1cb61637a1 100644
--- a/src/main/java/org/olat/modules/ceditor/ui/TitleEditorController.java
+++ b/src/main/java/org/olat/modules/ceditor/ui/TitleEditorController.java
@@ -98,7 +98,7 @@ public class TitleEditorController extends FormBasicController implements PageEl
titleItem.getEditorConfiguration().setSendOnBlur(true);
titleItem.getEditorConfiguration().disableMenuAndMenuBar();
- staticItem = uifactory.addStaticTextElement(cmpId + "_static", contentOrExample(content), formLayout);
+ staticItem = uifactory.addStaticTextElement(cmpId.concat("_static"), null, contentOrExample(content), formLayout);
staticItem.setDomWrapperElement(DomWrapperElement.div); // content contains multiple P elements
flc.getFormItemComponent().contextPut("cmpId", cmpId);
diff --git a/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_de.properties
index a5630c1427129b835a6e4caa83df246c2cdc6330..1b44581a9a38290a75ab29be4bdf986fb73cafec 100644
--- a/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_de.properties
@@ -55,6 +55,7 @@ image.description.show=Beschreibung anzeigen
image.description.content=Beschreibung
image.origin=Quelle
image.origin.show=Quelle anzeigen
+image.size=Bildgr\u00F6sse
image.size.fill=Ganze Breite ausf\u00FCllen
image.size.large=Gross
image.size.medium=Mittel
diff --git a/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_en.properties
index c8cf3c1a998b09fcc6c7d2a11eb53e3e2c456b0c..5f2fdc513ff3c25126b43f2785250bfe6a122df4 100644
--- a/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_en.properties
@@ -55,6 +55,7 @@ image.description.content=Description
image.description.show=Show description
image.origin=Origin
image.origin.show=Show origin
+image.size=Image size
image.size.fill=Fill the full width
image.size.large=Large
image.size.medium=Medium
diff --git a/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_fr.properties
index 40890760ea564189670c3a5d190d7a1024f2e627..6a42698f52efe180547f0654ac9c6aa190428c1e 100644
--- a/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_fr.properties
@@ -54,6 +54,7 @@ image.description.content=Description
image.description.show=Afficher la description
image.origin=Source
image.origin.show=Afficher la source
+image.size=Taille de l'image
image.size.fill=Remplir toute la largeur
image.size.large=Large
image.size.medium=Moyen
diff --git a/src/main/java/org/olat/modules/lecture/ui/TeacherRollCallWizardController.java b/src/main/java/org/olat/modules/lecture/ui/TeacherRollCallWizardController.java
index dcd76e66ab20d56fd20484d84cc9291e07469b27..684202ee8b1c695b39e2f2fd6d562fe1c654c100 100644
--- a/src/main/java/org/olat/modules/lecture/ui/TeacherRollCallWizardController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/TeacherRollCallWizardController.java
@@ -69,7 +69,7 @@ public class TeacherRollCallWizardController extends BasicController {
this.secCallback = secCallback;
this.lectureBlock = lectureBlock;
this.participants = participants;
- if(participants.size() > 0) {
+ if(!participants.isEmpty()) {
calledIdentity = participants.get(0);
}
@@ -208,7 +208,7 @@ public class TeacherRollCallWizardController extends BasicController {
participantValues[i] = userManager.getUserDisplayName(participant);
}
- participantsEl = uifactory.addDropdownSingleselect("participants", "participants", formLayout,
+ participantsEl = uifactory.addDropdownSingleselect("participants", null, formLayout,
participantKeys, participantValues, null);
participantsEl.setDomReplacementWrapperRequired(false);
participantsEl.addActionListener(FormEvent.ONCHANGE);
@@ -219,7 +219,7 @@ public class TeacherRollCallWizardController extends BasicController {
//last step
nextLink.setVisible(false);
participantsEl.setVisible(false);
- previousLink.setEnabled(participants.size() > 0);
+ previousLink.setEnabled(!participants.isEmpty());
} else {
int index = participants.indexOf(callIdentity);
nextLink.setVisible(true);
@@ -246,7 +246,7 @@ public class TeacherRollCallWizardController extends BasicController {
doClose(ureq);
} else if(participantsEl == source) {
if(participantsEl.isOneSelected()) {
- Long identityKey = new Long(participantsEl.getSelectedKey());
+ Long identityKey = Long.valueOf(participantsEl.getSelectedKey());
doSelect(ureq, identityKey);
}
}
diff --git a/src/main/java/org/olat/modules/portfolio/ui/PageMetadataController.java b/src/main/java/org/olat/modules/portfolio/ui/PageMetadataController.java
index a3cf8905c74309e85363ac3f4e0c243c2eae6edf..74b66fbe85aa3436155f5fad4e45b88ac722ac39 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/PageMetadataController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/PageMetadataController.java
@@ -435,7 +435,7 @@ public class PageMetadataController extends BasicController {
String[] values = new String[] {
translate("status.user.incoming"), translate("status.user.inProcess"), translate("status.user.done")
};
- statusEl = uifactory.addDropdownSingleselect("user.status", formLayout, keys, values, null);
+ statusEl = uifactory.addDropdownSingleselect("user.status", "page.status", formLayout, keys, values, null);
statusEl.setDomReplacementWrapperRequired(false);
statusEl.addActionListener(FormEvent.ONCHANGE);
if(pageUserInfos != null && pageUserInfos.getStatus() != null) {
diff --git a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties
index e8b6dc71f4db6eaea3c8b473cd8dd9a5346b21a5..85c146e854c2249cb365310e16427e08d208cbe0 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties
@@ -162,6 +162,8 @@ delete.section.confirm.descr=Wollen Sie wirklich diesem Bereich "{0}" l\u00F6sch
delete.section.confirm.title=Bereich l\u00F6schen
deleted.entries=Papierkorb
deleted.pages.breadcrump=Papierkorb
+details.bookmark=Bookmark setzen
+details.bookmark.remove=Bookmark entfernen
details.delete.error.assignments=Lernressource "{0}" kann nicht gel\u00F6scht werden. Es wird von Aufgaben in Portfolio ben\u00FCtzt.
document.by=von {0}
document.creationdate=Hochgeladen\: {0}
diff --git a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
index 944085f332b02810e78e9e4599880dd224c98633..69be87233b06eaff2505125a769edad160a33f59 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
@@ -162,6 +162,8 @@ delete.section.confirm.descr=Do you really want to delete this section "{0}"?
delete.section.confirm.title=Delete section
deleted.entries=Trash
deleted.pages.breadcrump=Trash
+details.bookmark=Set bookmark
+details.bookmark.remove=Remove bookmark
details.delete.error.assignments=This learning resource "{0}" cannot be deleted. There are assignment in portfolio which use it.
document.by=by {0}
document.creationdate=Uploaded\: {0}
diff --git a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_fr.properties
index 239a47942695686c0fea3fc0e4c59e651a768d05..13adb046815bb0d0aa273ffde731f7788379e1aa 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_fr.properties
@@ -157,6 +157,8 @@ delete.section.confirm.descr=Voulez-vous r\u00E9ellement effacer la section "{0}
delete.section.confirm.title=Effacer la section
deleted.entries=Poubelle
deleted.pages.breadcrump=Poubelle
+details.bookmark=Ajouter aux favoris
+details.bookmark.remove=Enlever le signet
details.delete.error.assignments=La ressource didactique "{0}" ne peut pas \u00EAtre supprim\u00E9e. Des devoirs de portfolios l'utilisent actuellement.
document.by=de {0}
document.creationdate=T\u00E9l\u00E9vers\u00E9\: {0}
diff --git a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_it.properties
index 894fd6638e5b41819dab30126699ade4b486e025..201fa6f89bd4a76c5561100c8099b8cdf3cb2fd7 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_it.properties
@@ -132,6 +132,8 @@ delete.section.confirm.descr=Vuoi veramente eliminare questa sezione "{0}"?
delete.section.confirm.title=Eliminare sezione
deleted.entries=Cestino
deleted.pages.breadcrump=Cestino
+details.bookmark=Creare segnalibro
+details.bookmark.remove=Rimuovere segnalibro
document.by=da {0}
document.creationdate=Caricato\: {0}
document.download=Scaricare documento\:
diff --git a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_pt_BR.properties
index a2c4092c4f4140baaaef9344be37caa36a7b09f3..bf02fd3aff55c7dcfe653d6fb4a7ca3cbd6cd497 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_pt_BR.properties
@@ -157,6 +157,8 @@ delete.section.confirm.descr=Deseja realmente excluir esta se\u00E7\u00E3o "{0}"
delete.section.confirm.title=Excluir se\u00E7\u00E3o
deleted.entries=Lixeira
deleted.pages.breadcrump=Lixeira
+details.bookmark=Marcar como favorito
+details.bookmark.remove=Remover favorito
details.delete.error.assignments=Este recurso did\u00E1tico "{0}" n\u00E3o pode ser exclu\u00EDdo. H\u00E1 uma atribui\u00E7\u00E3o em portfolio que o utiliza.
document.by=por {0}
document.creationdate=Enviado\: {0}
diff --git a/src/test/java/org/olat/selenium/Deployments.java b/src/test/java/org/olat/selenium/Deployments.java
index 4ad792c6da262314d6a05a32bf2e715af6923189..dbc9d6151a7b95bf9ee94aef9a78871140b330e1 100644
--- a/src/test/java/org/olat/selenium/Deployments.java
+++ b/src/test/java/org/olat/selenium/Deployments.java
@@ -55,13 +55,14 @@ public class Deployments {
@Deployment(testable = false)
public static WebArchive createDeployment() {
- Map<String,String> mailSettings = new HashMap<>();
+ Map<String,String> overrideSettings = new HashMap<>();
if(dumbster != null) {
- mailSettings.put("smtp.port", String.valueOf(dumbster.getPort()));
- mailSettings.put("smtp.host", "localhost");
+ overrideSettings.put("smtp.port", String.valueOf(dumbster.getPort()));
+ overrideSettings.put("smtp.host", "localhost");
log.info("Simple smtp server started on port: " + dumbster.getPort());
}
- return ArquillianDeployments.createDeployment(mailSettings);
+ overrideSettings.put("ldap.enable", "false");
+ return ArquillianDeployments.createDeployment(overrideSettings);
}
@After
diff --git a/src/test/java/org/olat/test/ArquillianDeployments.java b/src/test/java/org/olat/test/ArquillianDeployments.java
index d94e7e86f9b15bc3ed8344548c25dd155f27c328..40bee88eda164d8fe1f329a879a3e2eae681cffe 100644
--- a/src/test/java/org/olat/test/ArquillianDeployments.java
+++ b/src/test/java/org/olat/test/ArquillianDeployments.java
@@ -51,7 +51,6 @@ public class ArquillianDeployments {
public static WebArchive createDeployment() {
Map<String,String> overrideProperties = new HashMap<>();
- overrideProperties.put("ldap.enable", "false");
return createDeployment("openolat.war", overrideProperties);
}