From 8a9cd40bd5b98ec205c2ed394384b5b2f3ecd20e Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Tue, 18 Oct 2022 16:32:54 +0200 Subject: [PATCH] Voice announcements: distance only with one decimal unit. --- gradle.properties | 3 ++- .../VoiceAnnouncementUtilsTest.java | 26 +++++++++---------- src/main/res/values-b+es+419/strings.xml | 4 +-- src/main/res/values-cs/strings.xml | 5 ---- src/main/res/values-de/strings.xml | 4 +-- src/main/res/values-es/strings.xml | 4 +-- src/main/res/values-fr/strings.xml | 12 ++++----- src/main/res/values-gl/strings.xml | 6 ++--- src/main/res/values-nb/strings.xml | 6 ++--- src/main/res/values-nl/strings.xml | 4 +-- src/main/res/values-pt-rBR/strings.xml | 14 +++++----- src/main/res/values-ru/strings.xml | 24 ++++++++--------- src/main/res/values-tr/strings.xml | 6 ++--- src/main/res/values-vi/strings.xml | 6 ++--- src/main/res/values-zh/strings.xml | 6 ++--- src/main/res/values/strings.xml | 6 ++--- 16 files changed, 65 insertions(+), 71 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2d8d1e4dd..6e5de13d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=256m diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java index c18e13629..76e8771e0 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtilsTest.java @@ -64,7 +64,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString(); // then - assertEquals("Total distance 20.00 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement); + assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Average moving speed 18.4 kilometers per hour.", announcement); } @Test @@ -80,7 +80,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString(); // then - assertEquals("Total distance 20.00 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement); + assertEquals("Total distance 20.0 kilometers. 1 hour 1 second. Average moving speed 20.0 kilometers per hour.", announcement); } @Test @@ -96,13 +96,13 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString(); // then - assertEquals("Total distance 20.00 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement); + assertEquals("Total distance 20.0 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement); } @Test public void getAnnouncement_metric_distance_rounding_check_two() { TrackStatistics stats = new TrackStatistics(); - stats.setTotalDistance(Distance.of(19990)); + stats.setTotalDistance(Distance.of(19900)); stats.setTotalTime(Duration.ofHours(1).plusMinutes(5).plusSeconds(10)); stats.setMovingTime(Duration.ofHours(1)); stats.setMaxSpeed(Speed.of(100)); @@ -112,7 +112,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, null, null).toString(); // then - assertEquals("Total distance 19.99 kilometers. 1 hour. Average moving speed 20.0 kilometers per hour.", announcement); + assertEquals("Total distance 19.9 kilometers. 1 hour. Average moving speed 19.9 kilometers per hour.", announcement); } @Test @@ -134,7 +134,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, null).toString(); // then - assertEquals("Total distance 14.21 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement); + assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour.", announcement); } @Test @@ -150,7 +150,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, false, null, null).toString(); // then - assertEquals("Total distance 20.00 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement); + assertEquals("Total distance 20.0 kilometers. 1 hour 5 minutes 10 seconds. Pace 3 minutes 15 seconds per kilometer.", announcement); } @Test @@ -172,7 +172,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, false, lastInterval, null).toString(); // then - assertEquals("Total distance 14.21 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement); + assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Pace 1 minute 10 seconds per kilometer. Lap time 1 minute 10 seconds per kilometer.", announcement); } @Test @@ -188,7 +188,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, true, null, null).toString(); // then - assertEquals("Total distance 12.43 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement); + assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Average moving speed 11.4 miles per hour.", announcement); } @Test @@ -210,7 +210,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, true, lastInterval, null).toString(); // then - assertEquals("Total distance 8.83 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement); + assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Average moving speed 31.8 miles per hour. Lap speed 31.8 miles per hour.", announcement); } @Test @@ -226,7 +226,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, false, null, null).toString(); // then - assertEquals("Total distance 12.43 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement); + assertEquals("Total distance 12.4 miles. 1 hour 5 minutes 10 seconds. Pace 5 minutes 15 seconds per mile.", announcement); } @Test @@ -248,7 +248,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.IMPERIAL, false, lastInterval, null).toString(); // then - assertEquals("Total distance 8.83 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement); + assertEquals("Total distance 8.8 miles. 16 minutes 39 seconds. Pace 1 minute 53 seconds per mile. Lap time 1 minute 53 seconds per mile.", announcement); } @Test @@ -274,7 +274,7 @@ public class VoiceAnnouncementUtilsTest { String announcement = VoiceAnnouncementUtils.getAnnouncement(context, stats, UnitSystem.METRIC, true, lastInterval, sensorStatistics).toString(); // then - assertEquals("Total distance 14.21 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour. Average heart rate 180 bpm. Current heart rate 133 bpm.", announcement); + assertEquals("Total distance 14.2 kilometers. 16 minutes 39 seconds. Average moving speed 51.2 kilometers per hour. Lap speed 51.2 kilometers per hour. Average heart rate 180 bpm. Current heart rate 133 bpm.", announcement); } @Test diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml index 4d36e2c1e..efc7829e5 100644 --- a/src/main/res/values-b+es+419/strings.xml +++ b/src/main/res/values-b+es+419/strings.xml @@ -511,11 +511,11 @@ Distancia total 1 kilómetro - %1$.2f kilómetros + %1$.1f kilómetros 1 milla - %1$.2f millas + %1$.1f millas Ritmo cardíaco promedio Ritmo cardíaco actual diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 024f8aebe..8a2b1ad6e 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -550,11 +550,6 @@ limitations under the License. Rychlost kola Rychlost Celková vzdálenost - - - - - Průměrný srdeční tep Aktuální srdeční tep Ostatní nainstalované aplikace mohou nahrávání spustit nebo zastavit. diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index a051806e8..446bac2a8 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -540,7 +540,7 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka Trittfrequenz 1 Meile - %1$.2f Meilen + %1$.1f Meilen Primär pro Meile @@ -552,7 +552,7 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka Gesamtstrecke 1 Kilometer - %1$.2f Kilometer + %1$.1f Kilometer Kein kompatibler Dateimanager installiert Es gibt keine Aktivitäten für diesen Filter diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 32ee2a48e..dcc8523a6 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -562,11 +562,11 @@ limitations under the License. Distancia total 1 kilómetro - %1$.2f kilómetros + %1$.1f kilómetros 1 milla - %1$.2f millas + %1$.1f millas Ritmo cardíaco promedio Ritmo cardíaco actual diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 8cc9858e9..58ed99a6e 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -545,8 +545,8 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio Fréquence cardiaque moyenne Fréquence cardiaque actuelle - %1$.2f mile - %1$.2f miles + %1$.1f mile + %1$.1f miles Temps par tour Vitesse @@ -554,8 +554,8 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio D\'autres applications installées peuvent démarrer ou arrêter les enregistrements. Seul OpenTracks peut démarrer et arrêter les enregistrements. - %1$.2f kilomètre - %1$.2f kilomètres + %1$.1f kilomètre + %1$.1f kilomètres Distance totale natation @@ -602,8 +602,8 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio %1$.1f nœuds - %1$.2f mile nautique - %1$.2f milles nautique + %1$.1f mile nautique + %1$.1f milles nautique Nom du paquet pour l\'API Publique %1$d parcours diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index c92169c9b..76474d2d8 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -552,7 +552,7 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele Distancia total 1 milla - %1$.2f millas + %1$.1f millas Outras aplicacións instaladas poden iniciar ou deter gravacións. Só OpenTracks pode iniciar e deter as gravacións. @@ -565,7 +565,7 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele Vel. media en movemento 1 quilómetro - %1$.2f quilómetros + %1$.1f quilómetros Pulso medio Pulso actual @@ -595,7 +595,7 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele por milla náutica 1 milla náutica - %1$.2f millas náuticas + %1$.1f millas náuticas Usar API OpenTracks diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index c5d9e514c..af88a3bf1 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -558,12 +558,12 @@ limitations under the License. Total distanse 1 engelsk mil - %1$.2f engelske mil + %1$.1f engelske mil Gjennomsnittlig puls 1 kilometer - %1$.2f kilometer + %1$.1f kilometer Gjeldende puls Format på filnavnet @@ -596,7 +596,7 @@ limitations under the License. 1 nautisk mil - %1$.2f nautiske mil + %1$.1f nautiske mil Ingen app som støtter OpenTracks Dashboard API er installert. %1$d spor diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 9defe723b..e19db6c85 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -512,11 +512,11 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid Totale afstand 1 kilometer - %1$.2f kilometers + %1$.1f kilometers 1 mijl - %1$.2f mijlen + %1$.1f mijlen Gemiddelde hartslag Actuele hartslag diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 6cb746b4c..c5a62c094 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -503,8 +503,8 @@ Um aplicativo que iniciou uma gravação também pode acessar os dados gravados. Os dados gravados não serão compartilhados automaticamente com outros aplicativos. - %1$.2f quilômetro - %1$.2f quilômetros + %1$.1f quilômetro + %1$.1f quilômetros Dispensar API pública @@ -514,8 +514,8 @@ Velocidade da volta Distância total - %1$.2f milha - %1$.2f milhas + %1$.1f milha + %1$.1f milhas Frequência cardíaca atual Formato do nome do arquivo @@ -548,12 +548,10 @@ Velocidade (nós) %1$.1f nó - %1$.1f nós %1$.1f nós - %1$.2f milha náutica - %1$.2f milhas náuticas - %1$.2f milhas náuticas + %1$.1f milha náutica + %1$.1f milhas náuticas \ No newline at end of file diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 61f8831ea..3ce175acb 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -515,10 +515,10 @@ limitations under the License. Нет активностей для данного фильтра Имя раскладки уже существует - %1$.2f километр - %1$.2f километра - %1$.2f километров - %1$.2f километров + %1$.1f километр + %1$.1f километра + %1$.1f километров + %1$.1f километров Сбросить свои раскладки Настройки всех раскладок были сброшены @@ -546,10 +546,10 @@ limitations under the License. Скорость Общая дистанция - %1$.2f миля - %1$.2f миля - %1$.2f миль - %1$.2f миль + %1$.1f миля + %1$.1f миля + %1$.1f миль + %1$.1f миль Средний пульс Текущий пульс @@ -594,10 +594,10 @@ limitations under the License. уз - %1$.2f морская миля - %1$.2f морские мили - %1$.2f морских миль - %1$.2f морских миль + %1$.1f морская миля + %1$.1f морские мили + %1$.1f морских миль + %1$.1f морских миль %1$d узлов %1$.1f узла diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index 28d1a5c09..da75c6eb1 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -526,7 +526,7 @@ limitations under the License. Toplam mesafe 1 kilometre - %1$.2f kilometre + %1$.1f kilometre Kayıt tamamlandıktan sonra parçayı depolamaya aktar %1$.1f mi/s @@ -545,7 +545,7 @@ limitations under the License. Hız 1 mil - %1$.2f mil + %1$.1f mil Tam ekran Şu anki kalp atış hızı @@ -587,7 +587,7 @@ limitations under the License. deniz mili başına 1 deniz mili - %1$.2f deniz mili + %1$.1f deniz mili Genel API için paket adı diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 57fb8f728..80e1bf543 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -548,10 +548,10 @@ limitations under the License. Vòng tốc độ Tốc độ di chuyển trung bình - %1$.2f Tầng km + %1$.1f Tầng km - %1$.2f dặm + %1$.1f dặm Nhịp tim trung bình Hiện tại nhịp tim @@ -568,7 +568,7 @@ limitations under the License. Hải lý (dặm hải lý, ft) Tên gói cho API công khai - %1$.2f dặm hải lý + %1$.1f dặm hải lý Chọn hành vi \"hiện trên bản đồ\" Tốc độ vòng/nhịp độ diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml index 13d8886dd..ff393a649 100644 --- a/src/main/res/values-zh/strings.xml +++ b/src/main/res/values-zh/strings.xml @@ -490,10 +490,10 @@ limitations under the License. %1$.1f 英里/小时(推荐) 单圈用时 - %1$.2f 公里 + %1$.1f 公里 - %1$.2f 英里 + %1$.1f 英里 平均心率 不带照片 @@ -503,7 +503,7 @@ limitations under the License. 每海里 - %1$.2f 海里 + %1$.1f 海里 我想跟你分享一张图片 我觉得你可能对这张图片感兴趣。 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cc4a03cd0..33b88f20d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -581,15 +581,15 @@ limitations under the License. Total distance 1 kilometer - %1$.2f kilometers + %1$.1f kilometers 1 mile - %1$.2f miles + %1$.1f miles 1 nautical mile - %1$.2f nautical miles + %1$.1f nautical miles Average heart rate Current heart rate