summaryrefslogtreecommitdiff
path: root/core/src/main/java
diff options
context:
space:
mode:
authorMartin Fietz <Martin.Fietz@gmail.com>2017-04-13 08:05:54 +0200
committerGitHub <noreply@github.com>2017-04-13 08:05:54 +0200
commit639ff81f8c4d8d4648fe4a52bd1c7d05b439d7e2 (patch)
tree45a90ea68d8976336dcfb98080f97599ecc6d76e /core/src/main/java
parent7da9e8876be9ef8dfd1a54c170d62d5dd8de16f1 (diff)
parent78d11570e4c4e2733dad81ce45457d547b655400 (diff)
downloadAntennaPod-639ff81f8c4d8d4648fe4a52bd1c7d05b439d7e2.zip
Merge pull request #2290 from dklimkin/datefix
Let me fix CET/CEST once again
Diffstat (limited to 'core/src/main/java')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
index c06921c95..f118d4e53 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
@@ -28,7 +28,8 @@ public class DateUtils {
String date = input.trim().replace('/', '-').replaceAll("( ){2,}+", " ");
// CEST is widely used but not in the "ISO 8601 Time zone" list. Let's hack around.
- date = date.replaceAll("CEST$", "+01:00");
+ date = date.replaceAll("CEST$", "+02:00");
+ date = date.replaceAll("CET$", "+01:00");
// if datetime is more precise than seconds, make sure the value is in ms
if (date.contains(".")) {