From c0333e16e3a002a53378bccba32bb3282e63c2b6 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Wed, 24 Sep 2014 14:16:49 +0000
Subject: [PATCH] Settings improvements

---
 .../i2p/bote/android/config/SettingsActivity.java    | 12 ++++++++++++
 app/src/main/res/values/strings.xml                  |  8 ++++++--
 app/src/main/res/xml/settings_general.xml            |  6 +++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
index 7965ee2..1618355 100644
--- a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
@@ -217,6 +217,18 @@ public class SettingsActivity extends PreferenceActivity {
             if ("general".equals(settings)) {
                 addPreferencesFromResource(R.xml.settings_general);
 
+                ListPreference numSendHops = (ListPreference) findPreference("numSendHops");
+                numSendHops.setSummary(getResources().getQuantityText(R.plurals.pref_summ_numHops,
+                        Integer.valueOf(numSendHops.getValue())));
+                numSendHops.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                    @Override
+                    public boolean onPreferenceChange(Preference preference, Object newValue) {
+                        preference.setSummary(getResources().getQuantityText(R.plurals.pref_summ_numHops,
+                                Integer.valueOf((String) newValue)));
+                        return true;
+                    }
+                });
+
                 final PreferenceCategory i2pCat = (PreferenceCategory)findPreference("i2pCategory");
                 CheckBoxPreference routerAuto = (CheckBoxPreference)findPreference("i2pbote.router.auto");
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 043db76..ea5c11c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -150,11 +150,15 @@
     <string name="pref_title_privacy">Privacy</string>
     <string name="pref_title_hideLocale">Hide locale</string>
     <string name="pref_summ_hideLocale">Use English for text added to outgoing emails (\'Re:\', \'wrote:\', etc.)</string>
+    <string name="pref_summ_hideLocale_off">Use system language for text added to outgoing emails (\'Re:\', \'wrote:\', etc.)</string>
     <string name="pref_title_sentTime">Sent time</string>
     <string name="pref_summ_sentTime">Include sent time in outgoing emails</string>
     <string name="pref_title_routing">Routing</string>
-    <string name="pref_title_numHops">Relays</string>
-    <string name="pref_summ_numHops">Use %s relays when sending mail</string>
+    <string name="pref_title_numSendHops">Sending hops</string>
+    <plurals name="pref_summ_numHops">
+        <item quantity="one">%s relay</item>
+        <item quantity="other">%s relays</item>
+    </plurals>
     <string name="pref_title_minDelay">Minimum delay per hop</string>
     <string name="pref_summ_minDelay">%s minutes</string>
     <string name="pref_title_maxDelay">Maximum delay per hop</string>
diff --git a/app/src/main/res/xml/settings_general.xml b/app/src/main/res/xml/settings_general.xml
index b4289bb..4c8aa1c 100644
--- a/app/src/main/res/xml/settings_general.xml
+++ b/app/src/main/res/xml/settings_general.xml
@@ -23,7 +23,8 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="hideLocale"
-            android:summary="@string/pref_summ_hideLocale"
+            android:summaryOn="@string/pref_summ_hideLocale"
+            android:summaryOff="@string/pref_summ_hideLocale_off"
             android:title="@string/pref_title_hideLocale" />
         <CheckBoxPreference
             android:defaultValue="true"
@@ -37,8 +38,7 @@
             android:entries="@array/setting0to3"
             android:entryValues="@array/setting0to3"
             android:key="numSendHops"
-            android:summary="@string/pref_summ_numHops"
-            android:title="@string/pref_title_numHops" />
+            android:title="@string/pref_title_numSendHops" />
 
         <i2p.bote.android.util.IntEditTextPreference
             android:defaultValue="5"