From 906b9413d12822ea6a833c6598dd993bd826e36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rom=C3=A1n?= Date: Sun, 13 Sep 2020 19:30:17 +0200 Subject: [PATCH] Improved and simplified lap time/speed announcement message. --- .../dennisguse/opentracks/util/AnnouncementUtilsTest.java | 2 +- .../de/dennisguse/opentracks/util/AnnouncementUtils.java | 4 ++-- src/main/res/values-es/strings.xml | 6 ++---- src/main/res/values/strings.xml | 6 ++---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java index b22900992..a750ad897 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java @@ -59,7 +59,7 @@ public class AnnouncementUtilsTest { double kmPerHour = lastInterval.getSpeed_ms() * UnitConversions.MPS_TO_KMH; String firstPartMsg = "OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour"; - String rateMsg = " With a current kilometer speed of " + context.getResources().getQuantityString(speedId, getQuantityCount(kmPerHour), kmPerHour); + String rateMsg = " Lap speed of " + context.getResources().getQuantityString(speedId, getQuantityCount(kmPerHour), kmPerHour); String msg = firstPartMsg + rateMsg; // when diff --git a/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java b/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java index d960c20e2..5248f9cdd 100644 --- a/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/AnnouncementUtils.java @@ -37,7 +37,7 @@ public class AnnouncementUtils { rate = context.getResources().getQuantityString(speedId, getQuantityCount(distancePerTime), distancePerTime); currentRate = context.getResources().getQuantityString(speedId, getQuantityCount(currentDistancePerTime), currentDistancePerTime); - currentRateMsg = metricUnits ? context.getString(R.string.voice_speed_current_kilometer, currentRate) : context.getString(R.string.voice_speed_current_mile, currentRate); + currentRateMsg = context.getString(R.string.voice_speed_lap, currentRate); } else { double timePerDistance = distancePerTime == 0 ? 0.0 : 1 / distancePerTime; int paceId = metricUnits ? R.string.voice_pace_per_kilometer : R.string.voice_pace_per_mile; @@ -47,7 +47,7 @@ public class AnnouncementUtils { double currentTimePerDistance = currentDistancePerTime == 0 ? 0.0 : 1 / currentDistancePerTime; long currentTime = Math.round(currentTimePerDistance * UnitConversions.HR_TO_MIN * UnitConversions.MIN_TO_S * UnitConversions.S_TO_MS); currentRate = context.getString(paceId, getAnnounceTime(context, currentTime)); - currentRateMsg = metricUnits ? context.getString(R.string.voice_pace_current_kilometer, currentRate) : context.getString(R.string.voice_pace_current_mile, currentRate); + currentRateMsg = context.getString(R.string.voice_pace_lap, currentRate); } int totalDistanceId = metricUnits ? R.plurals.voiceTotalDistanceKilometers : R.plurals.voiceTotalDistanceMiles; diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index face34831..693cea673 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -497,10 +497,8 @@ g) haz lo que creas que ayude a OpenTracks. 2 millas por hora 0 millas por hora OpenTracks de %1$s en %2$s a %3$s - Con una velocidad del kilómetro actual de %1$s - Con una velocidad de la milla actual de %1$s - Con un ritmo del kilómetro actual de %1$s - Con un ritmo de la milla actual de %1$s + Velocidad de vuelta de %1$s + Tiempo de vuelta de %1$s distancia total de %1$.2f kilómetros distancia total de %1$.2f kilómetros distancia total de 1 kilómetro diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 285d65b44..c01cf9b1a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -521,10 +521,8 @@ limitations under the License. 2 miles per hour 0 miles per hour OpenTracks %1$s in %2$s at %3$s - With a current kilometer speed of %1$s - With a current mile speed of %1$s - With a current kilometer pace of %1$s - With a current mile pace of %1$s + Lap speed of %1$s + Lap time of %1$s total distance %1$.2f kilometers total distance %1$.2f kilometers total distance 1 kilometer