aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorrsudev <rasch@munin-soft.de>2014-12-23 23:46:21 +0100
committerrsudev <rasch@munin-soft.de>2014-12-23 23:46:21 +0100
commitc3a3fe7b9b6a65b7a91684ae325355537865c4cf (patch)
treeee65b2f571577bb9dc2af2db59c79cc06c494cd5 /main
parent5e7f9760ae1fb69eb920aadcac9d24148d5368ef (diff)
downloadcgeo-c3a3fe7b9b6a65b7a91684ae325355537865c4cf.zip
cgeo-c3a3fe7b9b6a65b7a91684ae325355537865c4cf.tar.gz
cgeo-c3a3fe7b9b6a65b7a91684ae325355537865c4cf.tar.bz2
Fixes #4559, opencaching: use language instead of country to retrieve descriptions
Diffstat (limited to 'main')
-rw-r--r--main/res/values/changelog_release.xml2
-rw-r--r--main/src/cgeo/geocaching/connector/oc/OkapiClient.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index 273fa51..f589bac 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,6 +2,8 @@
<resources>
<!-- changelog for the release branch -->
<string name="changelog_release" translatable="false">\n
+ <b>Next bugfix release:</b>\n
+ · Fix: Use phone language instead of country when requesting opencaching data\n
<b>2014.12.22:</b>\n
· New: Updated translations\n
· New: Google Play services are disabled by default on Android before 4.0\n
diff --git a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
index 26e0f78..1d0f991 100644
--- a/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/oc/OkapiClient.java
@@ -739,7 +739,7 @@ final class OkapiClient {
}
private static String getPreferredLanguage() {
- final String code = Locale.getDefault().getCountry();
+ final String code = Locale.getDefault().getLanguage();
if (StringUtils.isNotBlank(code)) {
return StringUtils.lowerCase(code) + "|en";
}