Skip to content
Snippets Groups Projects
Commit 0949c1fe authored by fkiefer's avatar fkiefer
Browse files

OO-2483 wording and icons

parent a01bb4e8
No related branches found
No related tags found
No related merge requests found
...@@ -40,7 +40,7 @@ public class TranscodingQueueTableRow { ...@@ -40,7 +40,7 @@ public class TranscodingQueueTableRow {
private String format; private String format;
private FormLink deleteLink; private FormLink deleteLink;
private FormLink retranscodeLink; private FormLink retranscodeLink;
private String failureReason; private Object[] failureReason;
protected FormUIFactory uifactory = FormUIFactory.getInstance(); protected FormUIFactory uifactory = FormUIFactory.getInstance();
...@@ -68,11 +68,11 @@ public class TranscodingQueueTableRow { ...@@ -68,11 +68,11 @@ public class TranscodingQueueTableRow {
} }
public String getFailureReason() { public Object[] getFailureReason() {
return failureReason; return failureReason;
} }
public void setFailureReason(String failureReason) { public void setFailureReason(Object[] failureReason) {
this.failureReason = failureReason; this.failureReason = failureReason;
} }
......
...@@ -92,7 +92,7 @@ public class VideoAdminErrorController extends FormBasicController { ...@@ -92,7 +92,7 @@ public class VideoAdminErrorController extends FormBasicController {
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel(); FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.resid)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.resid));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.displayname)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.displayname));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.failureReason)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.failureReason, new TranscodingErrorIconRenderer()));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.creator)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.creator));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.creationDate)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.creationDate));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.dimension)); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(TranscodingQueueTableCols.dimension));
...@@ -132,13 +132,16 @@ public class VideoAdminErrorController extends FormBasicController { ...@@ -132,13 +132,16 @@ public class VideoAdminErrorController extends FormBasicController {
retranscodeLink.setUserObject(videoTranscoding); retranscodeLink.setUserObject(videoTranscoding);
retranscodeLink.setIconLeftCSS("o_icon o_icon_refresh o_icon-fw"); retranscodeLink.setIconLeftCSS("o_icon o_icon_refresh o_icon-fw");
String failureReason = ""; Object[] failureReason = new Object[]{-1,""};
if (videoTranscoding.getStatus() == VideoTranscoding.TRANSCODING_STATUS_INEFFICIENT) { if (videoTranscoding.getStatus() == VideoTranscoding.TRANSCODING_STATUS_INEFFICIENT) {
failureReason = translate("transcoding.inefficient"); failureReason[0] = VideoTranscoding.TRANSCODING_STATUS_INEFFICIENT;
failureReason[1] = translate("transcoding.inefficient");
} else if (videoTranscoding.getStatus() == VideoTranscoding.TRANSCODING_STATUS_ERROR) { } else if (videoTranscoding.getStatus() == VideoTranscoding.TRANSCODING_STATUS_ERROR) {
failureReason = translate("transcoding.error"); failureReason[0] = VideoTranscoding.TRANSCODING_STATUS_ERROR;
failureReason[1] = translate("transcoding.error");
} else if (videoTranscoding.getStatus() == VideoTranscoding.TRANSCODING_STATUS_TIMEOUT) { } else if (videoTranscoding.getStatus() == VideoTranscoding.TRANSCODING_STATUS_TIMEOUT) {
failureReason = translate("transcoding.timeout"); failureReason[0] = VideoTranscoding.TRANSCODING_STATUS_TIMEOUT;
failureReason[1] = translate("transcoding.timeout");
} }
RepositoryEntry videoRe = repositoryService.loadByResourceKey(videoTranscoding.getVideoResource().getKey()); RepositoryEntry videoRe = repositoryService.loadByResourceKey(videoTranscoding.getVideoResource().getKey());
......
...@@ -79,8 +79,8 @@ track.upload.error.nofile=Bitte w\u00E4hlen Sie eine Datei aus. ...@@ -79,8 +79,8 @@ 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 track.upload.error.nolang=Bitte w\u00E4hlen Sie eine Sprache aus dieser Liste aus
transcoding.processing=In Bearbeitung transcoding.processing=In Bearbeitung
transcoding.waiting=In Warteschlange transcoding.waiting=In Warteschlange
transcoding.error=Transcoding fehlgeschlagen transcoding.error=Stammdatei besch\u00E4digt
transcoding.inefficient=Transcoding ineffizient transcoding.inefficient=Schlechte Qualit\u00E4t
transcoding.timeout=Zeit\u00FCberschreitung transcoding.timeout=Zeit\u00FCberschreitung
video.chapter.add=Kapitel hinzuf\u00FCgen video.chapter.add=Kapitel hinzuf\u00FCgen
video.chapter.chapterName=Kapitel video.chapter.chapterName=Kapitel
......
...@@ -79,8 +79,8 @@ track.upload.error.nofile=Please select a file. ...@@ -79,8 +79,8 @@ track.upload.error.nofile=Please select a file.
track.upload.error.nolang=Please select a language form the list track.upload.error.nolang=Please select a language form the list
transcoding.processing=Processing transcoding.processing=Processing
transcoding.waiting=Queuing transcoding.waiting=Queuing
transcoding.error=Transcoding failed transcoding.error=Master file damaged
transcoding.inefficient=Transcoding inefficient transcoding.inefficient=Poor quality
transcoding.timeout=Timeout transcoding.timeout=Timeout
video.chapter.add=Add Chapter video.chapter.add=Add Chapter
video.chapter.chapterName=Chapter video.chapter.chapterName=Chapter
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment