aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-10-30 17:07:22 +0100
committerSamuel Tardieu <sam@rfc1149.net>2014-10-30 17:07:22 +0100
commit955e5e8c86025101190c22f65410bd9fd6c6c2bd (patch)
tree279942b112bfc175458378c48784890c7ed084b0
parent57d3a6eea1b7fa5c32b15d3fcaa0997117887613 (diff)
parent49a4586362750343ae71e0b242a69bbc71b81462 (diff)
downloadcgeo-955e5e8c86025101190c22f65410bd9fd6c6c2bd.zip
cgeo-955e5e8c86025101190c22f65410bd9fd6c6c2bd.tar.gz
cgeo-955e5e8c86025101190c22f65410bd9fd6c6c2bd.tar.bz2
Merge branch 'release' into upstream
-rw-r--r--main/src/cgeo/geocaching/connector/gc/GCLogin.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLogin.java b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
index bf59323..f9a33ae 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCLogin.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCLogin.java
@@ -291,7 +291,7 @@ public class GCLogin extends AbstractLogin {
}
public static String formatGcCustomDate(int year, int month, int day) {
- return new SimpleDateFormat(Settings.getGcCustomDate()).format(new GregorianCalendar(year, month - 1, day).getTime());
+ return new SimpleDateFormat(Settings.getGcCustomDate(), Locale.ENGLISH).format(new GregorianCalendar(year, month - 1, day).getTime());
}
/**