From fadcf1cd413c1cacf43e2e39e23abfb57a2c47d9 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Tue, 28 Apr 2020 08:15:53 +0200
Subject: [PATCH] Pace/speed setting: changed label and renamed keys. Also
 removed existing translations.

---
 .../opentracks/util/AnnouncementUtilsTest.java         |  2 +-
 .../dennisguse/opentracks/util/PreferencesUtils.java   |  2 +-
 src/main/res/values-b+es+419/strings.xml               |  2 --
 src/main/res/values-ca/strings.xml                     |  2 --
 src/main/res/values/settings.xml                       | 10 +++++-----
 src/main/res/values/strings.xml                        |  3 +--
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java
index 50920da0d..c826ec62a 100644
--- a/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java
+++ b/src/androidTest/java/de/dennisguse/opentracks/util/AnnouncementUtilsTest.java
@@ -26,7 +26,7 @@ public class AnnouncementUtilsTest {
         stats.setTotalElevationGain(6000);
 
         // when
-        String announcement = AnnouncementUtils.getAnnouncement(context, stats);
+        String announcement = AnnouncementUtils.getAnnouncement(context, stats, "airplane");
 
         // then
         Assert.assertEquals("OpenTracks total distance 20.00 kilometers in 5 minutes 0 seconds at 240.0 kilometers per hour", announcement);
diff --git a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
index 53548c027..e1359692c 100644
--- a/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/PreferencesUtils.java
@@ -200,7 +200,7 @@ public class PreferencesUtils {
     public static boolean isReportSpeed(Context context, String category) {
         final String STATS_RATE_DEFAULT = context.getString(R.string.stats_rate_default);
         String currentStatsRate = getString(context, R.string.stats_rate_key, STATS_RATE_DEFAULT);
-        if (currentStatsRate.equals(getString(context, R.string.stats_rate_default_speed_or_pace, STATS_RATE_DEFAULT))) {
+        if (currentStatsRate.equals(getString(context, R.string.stats_rate_speed_or_pace_default, STATS_RATE_DEFAULT))) {
             return TrackIconUtils.isSpeedIcon(context, category);
         }
 
diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml
index f053d9c59..37041defc 100644
--- a/src/main/res/values-b+es+419/strings.xml
+++ b/src/main/res/values-b+es+419/strings.xml
@@ -93,8 +93,6 @@
     <string name="description_sensor_cadence">Cadencia (rpm)</string>
     <string name="description_sensor_heart_rate">Frecuencia cardíaca (lpm)</string>
     <string name="description_sensor_power">Potencia (W)</string>
-    <string name="description_default_speed_or_pace_imperial">Por Defecto</string>
-    <string name="description_default_speed_or_pace_metric">Por Defecto</string>
     <string name="description_speed_imperial">Velocidad (mi/h)</string>
     <string name="description_speed_metric">Velocidad (km/h)</string>
     <string name="description_time">Tiempo</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 6db97a348..c3e4d7161 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -93,8 +93,6 @@
     <string name="description_sensor_cadence">Cadència (rpm)</string>
     <string name="description_sensor_heart_rate">Freqüència cardíaca (bpm)</string>
     <string name="description_sensor_power">Potència (W)</string>
-    <string name="description_default_speed_or_pace_imperial">Per Defecte</string>
-    <string name="description_default_speed_or_pace_metric">Per Defecte</string>
     <string name="description_speed_imperial">Velocitat (mi/h)</string>
     <string name="description_speed_metric">Velocitat (km/h)</string>
     <string name="description_time">Temps</string>
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index c0aa73951..b78b2cfd7 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -170,23 +170,23 @@
     </string-array>
 
     <string name="stats_rate_key" translatable="false">statsRate</string>
-    <string name="stats_rate_default" translatable="false">@string/stats_rate_default_speed_or_pace</string>
+    <string name="stats_rate_default" translatable="false">@string/stats_rate_speed_or_pace_default</string>
     <string-array name="stats_rate_imperial_options">
-        <item>@string/description_default_speed_or_pace_imperial</item>
+        <item>@string/description_default_speed_or_pace</item>
         <item>@string/description_speed_imperial</item>
         <item>@string/description_pace_imperial</item>
     </string-array>
     <string-array name="stats_rate_metric_options">
-        <item>@string/description_default_speed_or_pace_metric</item>
+        <item>@string/description_default_speed_or_pace</item>
         <item>@string/description_speed_metric</item>
         <item>@string/description_pace_metric</item>
     </string-array>
 
-    <string name="stats_rate_default_speed_or_pace" translatable="false">DEFAULT</string>
+    <string name="stats_rate_speed_or_pace_default" translatable="false">ACTIVITY_TYPE</string>
     <string name="stats_rate_pace" translatable="false">PACE</string>
     <string name="stats_rate_speed" translatable="false">SPEED</string>
     <string-array name="stats_rate_values">
-        <item>@string/stats_rate_default_speed_or_pace</item>
+        <item>@string/stats_rate_speed_or_pace_default</item>
         <item>@string/stats_rate_speed</item>
         <item>@string/stats_rate_pace</item>
     </string-array>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 310360e9f..d27121ee3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -191,8 +191,7 @@ limitations under the License.
     <string name="description_sensor_cadence">Cadence (rpm)</string>
     <string name="description_sensor_heart_rate">Heart rate (bpm)</string>
     <string name="description_sensor_power">Power (W)</string>
-    <string name="description_default_speed_or_pace_imperial">By Default</string>
-    <string name="description_default_speed_or_pace_metric">By Default</string>
+    <string name="description_default_speed_or_pace">By activity type</string>
     <string name="description_speed_imperial">Speed (mi/hr)</string>
     <string name="description_speed_metric">Speed (km/hr)</string>
     <string name="description_time">Time</string>