From 0aeb574625ca16d646bd93d6a282342c8071148f Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Mon, 27 Oct 2014 18:56:52 +0100 Subject: Use English when parsing date Part of fix for #4416. --- main/src/cgeo/geocaching/connector/gc/GCLogin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/src/cgeo/geocaching/connector/gc/GCLogin.java b/main/src/cgeo/geocaching/connector/gc/GCLogin.java index d16a3cc..b61ea63 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 { @@ -279,7 +280,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 { -- cgit v1.1 From 43c1031337ff64667ef96ac70abfaba6de4331aa Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Sun, 26 Oct 2014 10:51:57 +0100 Subject: fix javadoc warning --- main/src/cgeo/geocaching/settings/Settings.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index aaaf64a..4dddd0e 100644 --- a/main/src/cgeo/geocaching/settings/Settings.java +++ b/main/src/cgeo/geocaching/settings/Settings.java @@ -6,7 +6,6 @@ import cgeo.geocaching.apps.cache.navi.NavigationAppFactory.NavigationAppsEnum; import cgeo.geocaching.connector.capability.ICredentials; import cgeo.geocaching.connector.gc.GCConnector; import cgeo.geocaching.connector.gc.GCConstants; -import cgeo.geocaching.connector.gc.GCLogin; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.enumerations.LiveMapStrategy.Strategy; import cgeo.geocaching.enumerations.LogType; @@ -506,7 +505,6 @@ public class Settings { /** * @return User selected date format on GC.com - * @see GCLogin#GC_CUSTOM_DATE_FORMATS */ public static String getGcCustomDate() { return getString(R.string.pref_gccustomdate, null); -- cgit v1.1