From 8e49a1b766487afb2828a527dfd4c67ac62ca45f Mon Sep 17 00:00:00 2001
From: dfurrer <none@none>
Date: Thu, 12 May 2016 15:47:30 +0200
Subject: [PATCH] OO-725: fixed wording, fixed initialisation of node-config,
added needed css-class to previewlink
---
.../course/nodes/video/VideoEditController.java | 9 +++++++++
.../nodes/video/_i18n/LocalStrings_de.properties | 13 +++++++------
.../nodes/video/_i18n/LocalStrings_en.properties | 9 +++++----
.../video/ui/_i18n/LocalStrings_de.properties | 10 +++++-----
.../video/ui/_i18n/LocalStrings_en.properties | 8 ++++----
5 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/video/VideoEditController.java b/src/main/java/org/olat/course/nodes/video/VideoEditController.java
index 96eda8b9c10..232ad152481 100644
--- a/src/main/java/org/olat/course/nodes/video/VideoEditController.java
+++ b/src/main/java/org/olat/course/nodes/video/VideoEditController.java
@@ -136,6 +136,7 @@ public class VideoEditController extends ActivateableTabbableDefaultController
String displayname = StringHelper.escapeHtml(repositoryEntry.getDisplayname());
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", displayname, Link.NONTRANSLATED, videoConfigurationVc, this);
previewLink.setTitle(getTranslator().translate("command.preview"));
+ previewLink.setIconLeftCSS("o_icon o_icon-fw o_icon_preview");
previewLink.setEnabled(true);
}
videoConfigurationVc.contextPut("showOptions", Boolean.TRUE);
@@ -374,6 +375,14 @@ class VideoOptionsForm extends FormBasicController{
descriptionField = uifactory.addRichTextElementForStringDataMinimalistic("description", "", desc, -1, -1, formLayout, getWindowControl());
updateDescriptionField();
uifactory.addFormSubmitButton("submit", formLayout);
+ //init options-config
+ config.setBooleanEntry(VideoEditController.CONFIG_KEY_COMMENTS, videoComments.isSelected(0));
+ config.setBooleanEntry(VideoEditController.CONFIG_KEY_RATING, videoRating.isSelected(0));
+ config.setBooleanEntry(VideoEditController.CONFIG_KEY_AUTOPLAY, videoAutoplay.isSelected(0));
+ config.setStringValue(VideoEditController.CONFIG_KEY_DESCRIPTION_SELECT, description.getSelectedKey());
+ if(description.getSelectedKey() == "customDescription"){
+ config.setStringValue(VideoEditController.CONFIG_KEY_DESCRIPTION_CUSTOMTEXT, descriptionField.getValue());
+ }
}
//update visibility of the textfield for entering custom description
diff --git a/src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_de.properties
index 3b81d60bf0d..62ef468eee2 100644
--- a/src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_de.properties
@@ -1,17 +1,18 @@
-chosenvideo=ausgewählte Videoresource
-command.changevideo=Videoresource ersetzten
-command.choosevideo=Videoresource auswählen
+chosenvideo=Gew\u00E4hltes Video
+command.changevideo=Video ersetzten
+command.choosevideo=Video auswählen
command.closevideo=Fenster schliessen
-command.createvideo=Videoressource auswählen oder importieren
+command.createvideo=Video auswählen oder importieren
+command.preview=preview video
title_video=Video
condition.accessibility.title=Zugang
header=Video auswählen
optionsSection=Optionen
-no.video.chosen=Kein Video ausgew\u00E4hlt
+no.video.chosen=<i>Kein Video ausgew\u00E4hlt</i>
preview.video=Vorschau
title_cvideo=Videoressource
pane.tab.accessibility=Zugang
-pane.tab.videoconfig=Video
+pane.tab.videoconfig=Lerninhalt
pane.tab.deliveryOptions=$org.olat.core.gui.control.generic.iframe\:option.delivery
video.config.comments=Video Kommentare
video.config.rating=Video Bewertung
diff --git a/src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_en.properties
index cf46a52933a..c12541807ab 100644
--- a/src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/video/_i18n/LocalStrings_en.properties
@@ -1,8 +1,9 @@
-chosenvideo=Selected Videoressource
-command.changevideo=Replace Videoressource
-command.choosevideo=Choose Videoressource
+chosenvideo=Selected Video
+command.changevideo=Replace Video
+command.choosevideo=Choose Video
command.closevideo=Close window
-command.createvideo=Select or import Videoressource
+command.createvideo=Select or import Video
+command.preview=preview video
title_video=Video
condition.accessibility.title=Access
header=Select Video
diff --git a/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties
index b3802a2de50..810466b574d 100644
--- a/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties
@@ -6,7 +6,7 @@ admin.config.transcoding=Transcoding aktivieren
admin.config.videoNode=Video Kursbaustein aktivieren
admin.menu.title=Video
admin.menu.title.alt=Konfiguration der Video-Resource
-poster.select=Dieses Vorschaubild ausw\u00E4hlen
+poster.select=Poster ausw\u00E4hlen
quality.table.header.dimension=Dimension
quality.table.header.format=Format
quality.table.header.size=Gr\u00F6sse
@@ -36,7 +36,7 @@ track.table.header.delete=l\u00F6schen
track.table.header.file=Datei
track.table.header.language=Sprache
track.table.label=Untertitel
-track.upload=Upload
+track.upload=Hochladen
track.upload.error.nofile=Bitte w\u00E4hlen Sie eine Datei aus.
track.upload.error.nolang=Bitte w\u00E4hlen Sie eine Sprache aus dieser Liste aus
video.config.creationDate=Erstellungs Datum
@@ -45,9 +45,9 @@ video.config.fileSize=Gr\u00F6sse der Videodatei
video.config.filename=Dateinamen
video.config.height=H\u00F6he
video.config.poster=Poster
-video.config.poster.hint=Hier k\u00F6nnen Sie das Titelbild konfigurieren welches vor dem Video angezeigt wird sowie in der Kursnode \u00FCbersicht.
-video.config.poster.replace=Ersetzte poster
-video.config.poster.upload=Upload poster
+video.config.poster.hint=Hier legen Sie fest welches Bild sowohl als Poster / Startbild für das Video im Kurs als auch als Titelbild für die Lernressource auf der Infoseite benutzt wird.
+video.config.poster.replace=Poster ersetzen
+video.config.poster.upload=Poster hochladen
video.config.ratio=Seitenverh\u00E4ltnis
video.config.track.table.file=Untertitel Datei
video.config.tracks=Verf\u00FCgbare Untertiteldateien
diff --git a/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties
index a4cdd2ae5a4..769a6ced37f 100644
--- a/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties
@@ -1,9 +1,9 @@
#Thu Apr 21 15:22:05 CEST 2016
add.track=Add Subtitle
-admin.config.enable=enable videoresource
+admin.config.enable=Enable videoresource
admin.config.title=Video Configuration
-admin.config.transcoding=enable video transcoding
-admin.config.videoNode=enable video coursenode
+admin.config.transcoding=Enable video transcoding
+admin.config.videoNode=Enable video coursenode
admin.menu.title=Video
admin.menu.title.alt=Configuration of the Video-Resource
poster.select=Select this poster frame
@@ -29,7 +29,7 @@ video.config.fileSize=Size of videofile
video.config.filename=Filename
video.config.height=Height
video.config.poster=Poster frame
-video.config.poster.hint=Here you can configure the posterframe which will be visible in the videoplayer before the video start playing aswell as in course overview
+video.config.poster.hint=Determine here which image or video still you wish to add as poster/start screen for the video in the course as well as the title image for the learning resource on the info page.
video.config.poster.replace=Replace poster
video.config.poster.upload=Upload poster
video.config.ratio=Aspect ratio
--
GitLab