From d18b2e26b8037eeda139d7988dc899d393bbb2e1 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Mon, 22 Aug 2022 23:22:16 +0200
Subject: [PATCH] Separate "free" and "paid" strings for charging and parking

because... French :D
---
 .../main/java/net/vonforst/evmap/model/ChargersModel.kt   | 8 ++++----
 app/src/main/res/values-de/strings.xml                    | 6 ++++--
 app/src/main/res/values/strings.xml                       | 6 ++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt b/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
index 3304b558..5f12e114 100644
--- a/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
@@ -167,9 +167,9 @@ data class Cost(
     fun getStatusText(ctx: Context, emoji: Boolean = false): CharSequence {
         if (freecharging != null && freeparking != null) {
             val charging =
-                if (freecharging) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+                if (freecharging) ctx.getString(R.string.charging_free) else ctx.getString(R.string.charging_paid)
             val parking =
-                if (freeparking) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+                if (freeparking) ctx.getString(R.string.parking_free) else ctx.getString(R.string.parking_paid)
             return if (emoji) {
                 "⚡ $charging · \uD83C\uDD7F️ $parking"
             } else {
@@ -177,7 +177,7 @@ data class Cost(
             }
         } else if (freecharging != null) {
             val charging =
-                if (freecharging) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+                if (freecharging) ctx.getString(R.string.charging_free) else ctx.getString(R.string.charging_paid)
             return if (emoji) {
                 "⚡ $charging"
             } else {
@@ -185,7 +185,7 @@ data class Cost(
             }
         } else if (freeparking != null) {
             val parking =
-                if (freeparking) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+                if (freeparking) ctx.getString(R.string.parking_free) else ctx.getString(R.string.parking_paid)
             return if (emoji) {
                 "\uD83C\uDD7F $parking"
             } else {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 74e82bbf..7f9e2dee 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -19,8 +19,10 @@
     <string name="cost_detail"><![CDATA[<b>Laden:</b> %1$s · <b>Parken:</b> %2$s]]></string>
     <string name="cost_detail_charging"><![CDATA[<b>%s laden</b>]]></string>
     <string name="cost_detail_parking"><![CDATA[<b>%s parken</b>]]></string>
-    <string name="free">Kostenlos</string>
-    <string name="paid">Kostenpflichtig</string>
+    <string name="charging_free">Kostenlos</string>
+    <string name="charging_paid">Kostenpflichtig</string>
+    <string name="parking_free">Kostenlos</string>
+    <string name="parking_paid">Kostenpflichtig</string>
     <string name="amenities">Ladeweile</string>
     <string name="general_info">Allgemeine Hinweise</string>
     <string name="realtime_data_unavailable">Echtzeitstatus nicht verfügbar</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe222af1..b65a5c6e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,8 +18,10 @@
     <string name="cost_detail"><![CDATA[<b>Charging:</b> %1$s · <b>Parking:</b> %2$s]]></string>
     <string name="cost_detail_charging"><![CDATA[<b>%s charging</b>]]></string>
     <string name="cost_detail_parking"><![CDATA[<b>%s parking</b>]]></string>
-    <string name="free">Free</string>
-    <string name="paid">Paid</string>
+    <string name="charging_free">Free</string>
+    <string name="charging_paid">Paid</string>
+    <string name="parking_free">Free</string>
+    <string name="parking_paid">Paid</string>
     <string name="amenities">Amenities</string>
     <string name="general_info">General information</string>
     <string name="realtime_data_unavailable">Real-time status unavailable</string>