From 53ab8dc4e8ee6afe02fd752a6ccd19fb396aa6b9 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sun, 21 Aug 2022 20:18:21 +0200
Subject: [PATCH] Add singular and plural variants for prefs_my_tariffs_summary

---
 .../google/java/net/vonforst/evmap/auto/SettingsScreens.kt   | 5 ++++-
 .../evmap/fragment/preference/ChargepriceSettingsFragment.kt | 3 ++-
 app/src/main/res/values-de/strings.xml                       | 5 ++++-
 app/src/main/res/values/strings.xml                          | 5 ++++-
 app/src/main/res/xml/settings_chargeprice.xml                | 3 +--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt b/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt
index 2b1fbdcb..1297902f 100644
--- a/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt
@@ -218,7 +218,10 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                                     R.plurals.chargeprice_some_tariffs_selected,
                                     n,
                                     n
-                                ) + "\n" + carContext.getString(R.string.pref_my_tariffs_summary)
+                                ) + "\n" + carContext.resources.getQuantityString(
+                                R.plurals.pref_my_tariffs_summary,
+                                n
+                            )
                         }
                     )
                 }.build())
diff --git a/app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt b/app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt
index 7a179c51..bf2f1c9a 100644
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt
@@ -70,7 +70,8 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
                         R.plurals.chargeprice_some_tariffs_selected,
                         n,
                         n
-                    ) + "\n" + getString(R.string.pref_my_tariffs_summary)
+                    ) + "\n" + requireContext().resources
+                    .getQuantityString(R.plurals.pref_my_tariffs_summary, n)
             }
     }
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 75c17f92..74e82bbf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -204,7 +204,10 @@
     <string name="pref_chargeprice_currency">Währung</string>
     <string name="pref_my_tariffs">Meine Tarife</string>
     <string name="chargeprice_all_tariffs_selected">alle Tarife ausgewählt</string>
-    <string name="pref_my_tariffs_summary">(werden im Preisvergleich hervorgehoben)</string>
+    <plurals name="pref_my_tariffs_summary">
+        <item quantity="one">(wird im Preisvergleich hervorgehoben)</item>
+        <item quantity="other">(werden im Preisvergleich hervorgehoben)</item>
+    </plurals>
     <string name="license">Lizenz</string>
     <string name="settings_charger_data">Ladesäulen</string>
     <string name="pref_data_source">Datenquelle</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bce117c8..fe222af1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -202,7 +202,10 @@
     <string name="chargeprice_no_compatible_connectors">None of the connectors on this charging station is compatible with your vehicle.</string>
     <string name="pref_chargeprice_currency">Currency</string>
     <string name="pref_my_tariffs">My charging plans</string>
-    <string name="pref_my_tariffs_summary">(will be highlighted in price comparison)</string>
+    <plurals name="pref_my_tariffs_summary">
+        <item quantity="one">(will be highlighted in price comparison)</item>
+        <item quantity="other">(will be highlighted in price comparison)</item>
+    </plurals>
     <string name="chargeprice_all_tariffs_selected">all plans selected</string>
     <string name="license">License</string>
     <string name="settings_charger_data">Charging stations</string>
diff --git a/app/src/main/res/xml/settings_chargeprice.xml b/app/src/main/res/xml/settings_chargeprice.xml
index cf4b6c36..2cb25399 100644
--- a/app/src/main/res/xml/settings_chargeprice.xml
+++ b/app/src/main/res/xml/settings_chargeprice.xml
@@ -8,8 +8,7 @@
         app:defaultToAll="false" />
     <net.vonforst.evmap.ui.MultiSelectDialogPreference
         android:key="chargeprice_my_tariffs"
-        android:title="@string/pref_my_tariffs"
-        android:summary="@string/pref_my_tariffs_summary" />
+        android:title="@string/pref_my_tariffs" />
     <ListPreference
         android:key="chargeprice_currency"
         android:title="@string/pref_chargeprice_currency"