aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-10-27 18:57:46 +0100
committerSamuel Tardieu <sam@rfc1149.net>2014-10-27 18:57:46 +0100
commit83d1c9eb79d8422506e6e1c4a1102df6f9f6f4c8 (patch)
tree6961ad5b97c1aa26194668c3345b996cfa146eb8
parenta980d78f5144bf6aef2a7cf4d89c5c32214bdcaa (diff)
parent43c1031337ff64667ef96ac70abfaba6de4331aa (diff)
downloadcgeo-83d1c9eb79d8422506e6e1c4a1102df6f9f6f4c8.zip
cgeo-83d1c9eb79d8422506e6e1c4a1102df6f9f6f4c8.tar.gz
cgeo-83d1c9eb79d8422506e6e1c4a1102df6f9f6f4c8.tar.bz2
Merge branch 'issue-4416' into upstream
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCLogin.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLogin.java b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
index 9eb54ad..acfae54 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLogin.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
@@ -29,6 +29,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.GregorianCalendar;
+import java.util.Locale;
public class GCLogin extends AbstractLogin {
@@ -282,7 +283,7 @@ public class GCLogin extends AbstractLogin {
}
public static Date parseGcCustomDate(final String input, final String format) throws ParseException {
- return new SimpleDateFormat(format).parse(input.trim());
+ return new SimpleDateFormat(format, Locale.ENGLISH).parse(input.trim());
}
public static Date parseGcCustomDate(final String input) throws ParseException {