diff --git a/src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java b/src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java index 2b4b5e5b55020544b041e816f201393c6b120729..80d42c283926bb7bb6b2fa20fb3bcedac324d4fe 100644 --- a/src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java +++ b/src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java @@ -89,24 +89,20 @@ class FeedFormController extends FormBasicController { initForm(ureq); } - /** - * @see org.olat.core.gui.components.form.flexible.impl.FormBasicController#doDispose() - */ + @Override protected void doDispose() { - // nothing to dispose + // nothing to dispose } - /** - * @see org.olat.core.gui.components.form.flexible.impl.FormBasicController#formOK(org.olat.core.gui.UserRequest) - */ @Override protected void formOK(UserRequest ureq) { feed.setTitle(title.getValue()); feed.setDescription(description.getValue()); - if(feed.isExternal()) - feed.setExternalFeedUrl(feedUrl.isEmpty() ? null : feedUrl.getValue()); + if(feed.isExternal()) { + feed.setExternalFeedUrl(feedUrl.isEmpty() ? null : feedUrl.getValue()); + } feed.setLastModified(new Date()); // The image is retrieved by the main controller @@ -236,6 +232,7 @@ class FeedFormController extends FormBasicController { deleteImage.setVisible(false); file = uifactory.addFileElement(getWindowControl(), "feed.file.label", formLayout); + file.setExampleKey("feed.form.file.type.explain.images", null); file.addActionListener(FormEvent.ONCHANGE); file.setPreview(ureq.getUserSession(), true); if (feed.getImageName() != null) { diff --git a/src/main/java/org/olat/modules/webFeed/ui/ItemFormController.java b/src/main/java/org/olat/modules/webFeed/ui/ItemFormController.java index 14c8a53ac7f078785577ac0835738555f8553861..57756fae640563df9180d98edd1f55ee280a2e88 100644 --- a/src/main/java/org/olat/modules/webFeed/ui/ItemFormController.java +++ b/src/main/java/org/olat/modules/webFeed/ui/ItemFormController.java @@ -132,6 +132,7 @@ public abstract class ItemFormController extends FormBasicController { file = uifactory.addFileElement(getWindowControl(), "file", null, flc); file.setLabel("feed.item.file.label", null); + file.setExampleKey("feed.form.file.type.explain", null); if (hasMandatoryMedia()) { file.setMandatory(true, "feed.item.file.mandatory"); } else { diff --git a/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties index 9a686dcd8b5888f2e6301ef7473e8e1b2ccb2457..b961ef295dafc320f706dbf40a96beb1ff88f942 100644 --- a/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties @@ -15,6 +15,8 @@ feed.form.feedurl.invalid.not_found = Die angegebene URL existiert nicht oder Do feed.form.feedurl.invalid.no_media = Die angegebene URL ist keine Podcast URL feed.form.file.type.error = Der gew\u00E4hlte Dateityp wird nicht unterst\u00FCtzt. Unterst\u00FCtzte Formate sind FLV, MP3, MP4, M4V, M4A und AAC. feed.form.file.type.error.images = Der gew\u00E4hlte Dateityp wird nicht unterst\u00FCtzt. Unterst\u00FCtzte Formate sind JPEG, PNG und GIF. +feed.form.file.type.explain = Folgende Dateitypen werden unterst\u00FCtzt: MP3, MP4, M4V, M4A und AAC. +feed.form.file.type.explain.images = Folgende Dateitypen werden unterst\u00FCtzt: JPEG, PNG und GIF. ULLimitExceeded=$org.olat.core.commons.modules.bc\:ULLimitExceeded feed.no.image = Kein Bild vorhanden feed.url.label = Feed-URL: diff --git a/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_en.properties index 8b8a37b535749c6dded5e40a592d848d52132b49..f2a73750058f5ea0378a0a7f12fea8fed0cac78c 100644 --- a/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_en.properties @@ -14,6 +14,8 @@ feed.form.feedurl.invalid.not_found=The URL provided does not exist or this docu feed.form.field.is_mandatory=This field is mandatory. feed.form.file.type.error=The file type selected is not supported. Supported formats are FLV, MP3, MP4, M4V, M4A, and AAC. feed.form.file.type.error.images=The file type selected is not supported. Supported formats are JPEG, PNG, and GIF. +feed.form.file.type.explain = The following formats are accepted\: MP3, MP4, M4V, M4A and AAC. +feed.form.file.type.explain.images = The following formats are accepted\: JPEG, PNG and GIF. feed.form.minutes.error=The indication of minutes is invalid. feed.image.delete=Delete image feed.is.being.edited.by=This description is being edited by {0}. diff --git a/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_fr.properties index 62c4b7ded190d904de8a18d470d24f2be04e943e..a9adff74d8604cf7a28234107489c8821b5b1572 100644 --- a/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_fr.properties +++ b/src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_fr.properties @@ -14,6 +14,8 @@ feed.form.feedurl.invalid.not_found=L'URL indiqu\u00E9e n'existe pas ou le docum feed.form.field.is_mandatory=Ce champ est obligatoire feed.form.file.type.error=Le type de fichier s\u00E9lectionn\u00E9 n'est pas compatible. Les formats compatibles sont FLV, MP3, M4V, MP4, et AAC. feed.form.file.type.error.images=Le type de fichier s\u00E9lectionn\u00E9 n'est pas tol\u00E9r\u00E9. Les formats tol\u00E9r\u00E9s sont JPEG, PNG et GIF. +feed.form.file.type.explain = Les types de fichiers suivants sont admis\: MP3, MP4, M4V, M4A and AAC. +feed.form.file.type.explain.images = Les types de fichiers suivants sont admis\: JPEG, PNG and GIF. feed.form.minutes.error=L'indication des minutes n'est pas valable. feed.image.delete=Effacer image feed.is.being.edited.by=La description est actuellement en cours d'\u00E9dition par {0}.