From 24cba00d01677ade2a5a9bbebd4c6757ecd4b8e8 Mon Sep 17 00:00:00 2001
From: uhensler <none@none>
Date: Tue, 4 Jul 2017 16:43:47 +0200
Subject: [PATCH] OO-2723: Remove unnecessary commas, warning instead of errors
---
.../org/olat/modules/webFeed/manager/FeedFileStorge.java | 6 +++---
.../modules/webFeed/ui/_i18n/LocalStrings_de.properties | 2 +-
.../modules/webFeed/ui/_i18n/LocalStrings_en.properties | 2 +-
.../org/olat/modules/webFeed/ui/blog/_content/post.html | 2 +-
.../org/olat/modules/webFeed/ui/blog/_content/posts.html | 2 +-
.../olat/modules/webFeed/ui/podcast/_content/episode.html | 2 +-
.../olat/modules/webFeed/ui/podcast/_content/episodes.html | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java b/src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java
index 141407a080d..58e6188e339 100644
--- a/src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java
+++ b/src/main/java/org/olat/modules/webFeed/manager/FeedFileStorge.java
@@ -291,7 +291,7 @@ public class FeedFileStorge {
feed = (FeedImpl) XStreamHelper.readObject(xstream, leaf.getInputStream());
}
} else {
- log.error("Feed XML-File could not be found on file system. Feed container: " + feedContainer);
+ log.warn("Feed XML-File could not be found on file system. Feed container: " + feedContainer);
}
return feed;
@@ -312,7 +312,7 @@ public class FeedFileStorge {
try (InputStream in = Files.newInputStream(feedPath)) {
feed = (FeedImpl) XStreamHelper.readObject(xstream, in);
} catch (IOException e) {
- log.error("Feed XML-File could not be found on file system. Feed path: " + feedPath, e);
+ log.warn("Feed XML-File could not be found on file system. Feed path: " + feedPath, e);
}
}
@@ -367,7 +367,7 @@ public class FeedFileStorge {
try {
item = (ItemImpl) XStreamHelper.readObject(xstream, leaf.getInputStream());
} catch (Exception e) {
- log.error("Item XML-File could not be read. Item container: " + leaf);
+ log.warn("Item XML-File could not be read. Item container: " + leaf);
}
} else {
log.error("Item XML-File could not be found on file system."
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 2008511f041..474d6e78d86 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
@@ -33,7 +33,7 @@ feed.item.file.height = H\u00F6he
feed.item.file.size.error=Falsches Zahlenformat
feed.item.file.mandatory = Eine Episode verlangt eine Audio- oder Videodatei, die mit Flash abgespielt werden kann.
feed.item.file.name.notvalid=$org.olat.core.commons.modules.bc\:cfile.name.notvalid
-feed.modified.by.on = ge\u00e4ndert von {0} am {1}
+feed.modified.by.on = Ge\u00e4ndert von {0} am {1}
feed.published.on = Publiziert am {0}
feed.published.by = Publiziert von {0}
feed.published.by.on = Publiziert von {0} am {1}
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 4be0ecc590d..90e02b89899 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
@@ -29,7 +29,7 @@ feed.item.is.being.edited.by=This entry is being edited by {0}.
feed.item.original=Original entry
feed.item.scheduled.for=Scheduled publication on {0}
feed.link.more=read more
-feed.modified.by.on=modified by {0} on {1}
+feed.modified.by.on=Modified by {0} on {1}
feed.no.image=No image available
feed.publish=Publish
feed.publish.date=Time and date of publication
diff --git a/src/main/java/org/olat/modules/webFeed/ui/blog/_content/post.html b/src/main/java/org/olat/modules/webFeed/ui/blog/_content/post.html
index 354cf313d48..f09cee3cd0c 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/blog/_content/post.html
+++ b/src/main/java/org/olat/modules/webFeed/ui/blog/_content/post.html
@@ -19,7 +19,7 @@
#set ( $info = $helper.getInfo($item) )
#if ( $info )
$info
- #if($helper.isModified($item)),
+ #if($helper.isModified($item))
<div class="text-warning">$r.escapeHtml($helper.getModifierInfo($item))</div>
#end
#end
diff --git a/src/main/java/org/olat/modules/webFeed/ui/blog/_content/posts.html b/src/main/java/org/olat/modules/webFeed/ui/blog/_content/posts.html
index c350519327f..bb6371a33af 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/blog/_content/posts.html
+++ b/src/main/java/org/olat/modules/webFeed/ui/blog/_content/posts.html
@@ -46,7 +46,7 @@
#set ( $info = $helper.getInfo($post) )
#if ( $info )
$info
- #if($helper.isModified($post)),
+ #if($helper.isModified($post))
<div class="text-warning">$r.escapeHtml($helper.getModifierInfo($post))</div>
#end
#end
diff --git a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html
index 1722c760cc0..e9cde8e88a1 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html
+++ b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episode.html
@@ -20,7 +20,7 @@
#set ( $info = $helper.getInfo($item) )
#if ( $info )
$info
- #if($helper.isModified($item)),
+ #if($helper.isModified($item))
<div class="text-warning">$r.escapeHtml($helper.getModifierInfo($item))</div>
#end
#end
diff --git a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
index 20e489f6a1a..f7f0e5d1bfd 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
+++ b/src/main/java/org/olat/modules/webFeed/ui/podcast/_content/episodes.html
@@ -50,7 +50,7 @@
#set ( $info = $helper.getInfo($episode) )
#if ( $info )
$info
- #if($helper.isModified($episode)),
+ #if($helper.isModified($episode))
<div class="text-warning">$r.escapeHtml($helper.getModifierInfo($episode))</div>
#end
#end
--
GitLab