2 files changed, 21 insertions, 11 deletions
diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java
index 71c6d4a..fe1e191 100644
--- a/main/src/cgeo/geocaching/settings/Settings.java
+++ b/main/src/cgeo/geocaching/settings/Settings.java
@@ -471,7 +471,7 @@ public final class Settings {
 
     /**
      * @return User selected date format on GC.com
-     * @see Login#gcCustomDateFormats
+     * @see Login#GC_CUSTOM_DATE_FORMATS
      */
     public static String getGcCustomDate() {
         return getString(R.string.pref_gccustomdate, null);
@@ -548,16 +548,9 @@ public final class Settings {
 
     static boolean getImperialUnitsDefault() {
         final String countryCode = Locale.getDefault().getCountry();
-        if ("US".equals(countryCode)) {
-            return true; // USA
-        }
-        if ("LR".equals(countryCode)) {
-            return true; // Liberia
-        }
-        if ("MM".equals(countryCode)) {
-            return true; // Burma
-        }
-        return false;
+        return "US".equals(countryCode)  // USA
+            || "LR".equals(countryCode)  // Liberia
+            || "MM".equals(countryCode); // Burma
     }
 
     public static boolean isLiveMap() {
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index d2c73f3..90b6145 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -8,6 +8,7 @@ import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory.NavigationAppsEnum;
 import cgeo.geocaching.compatibility.Compatibility;
+import cgeo.geocaching.connector.gc.GCConnector;
 import cgeo.geocaching.connector.gc.Login;
 import cgeo.geocaching.files.SimpleDirChooser;
 import cgeo.geocaching.maps.MapProviderFactory;
@@ -151,6 +152,22 @@ public class SettingsActivity extends PreferenceActivity {
         getPreference(R.string.pref_connectorOCActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
         getPreference(R.string.pref_connectorOCPLActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
         getPreference(R.string.pref_connectorGCActive).setOnPreferenceChangeListener(VALUE_CHANGE_LISTENER);
+        setWebsite(R.string.pref_fakekey_gc_website, GCConnector.getInstance().getHost());
+        setWebsite(R.string.pref_fakekey_ocde_website, "opencaching.de");
+        setWebsite(R.string.pref_fakekey_ocpl_website, "opencaching.pl");
+        setWebsite(R.string.pref_fakekey_gcvote_website, "gcvote.com");
+        setWebsite(R.string.pref_fakekey_sendtocgeo_website, "send2.cgeo.org");
+    }
+
+    private void setWebsite(final int preferenceKey, final String host) {
+        Preference preference = getPreference(preferenceKey);
+        preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(final Preference preference) {
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://" + host)));
+                return true;
+            }
+        });
     }
 
     private static String getKey(final int prefKeyId) {