aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2013-02-23 07:25:42 +0100
committerBananeweizen <bananeweizen@gmx.de>2013-02-23 07:25:42 +0100
commitfea02d9c617ad38eeeca83b453adb24559f23b39 (patch)
tree48444aef843586ec864f1808e567cc33947cad59
parent99ac4e0461eba5de01858222cfc35f6cc1276e4d (diff)
downloadcgeo-fea02d9c617ad38eeeca83b453adb24559f23b39.zip
cgeo-fea02d9c617ad38eeeca83b453adb24559f23b39.tar.gz
cgeo-fea02d9c617ad38eeeca83b453adb24559f23b39.tar.bz2
fix #2512: Load OC caches in preferred language (OKAPI)
-rw-r--r--main/src/cgeo/geocaching/connector/oc/OkapiClient.java12
-rw-r--r--main/src/cgeo/geocaching/network/Parameters.java4
2 files changed, 15 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index dbcfea5..0673605 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -297,8 +297,18 @@ final public class OkapiClient {
return null;
}
- final String uri = "http://" + host + service;
((OCApiConnector) connector).addAuthentication(params);
+ params.add("langpref", getPreferredLanguage());
+
+ final String uri = "http://" + host + service;
return Network.requestJSON(uri, params);
}
+
+ private static String getPreferredLanguage() {
+ final String code = Locale.getDefault().getCountry();
+ if (StringUtils.isNotBlank(code)) {
+ return StringUtils.lowerCase(code) + "|en";
+ }
+ return "en";
+ }
}
diff --git a/main/src/cgeo/geocaching/network/Parameters.java b/main/src/cgeo/geocaching/network/Parameters.java
index 74f5531..f035c4a 100644
--- a/main/src/cgeo/geocaching/network/Parameters.java
+++ b/main/src/cgeo/geocaching/network/Parameters.java
@@ -104,4 +104,8 @@ public class Parameters extends ArrayList<NameValuePair> {
return params;
}
+ public void add(final String key, final String value) {
+ put(key, value);
+ }
+
}