mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2026-04-23 23:57:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Separate "free" and "paid" strings for charging and parking

Browse Source 
because... French :D
This commit is contained in:
johan12345
2022-08-22 23:22:16 +02:00
parent d5f55366a9
commit d18b2e26b8
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt
View File

@@ -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 {

6
app/src/main/res/values-de/strings.xml
View File

@@ -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>

6
app/src/main/res/values/strings.xml
View File

@@ -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>