From cb9f34f7eca6dc7d38cca1f11fd57a0cfa6c830d Mon Sep 17 00:00:00 2001
From: christianfl <11208965+christianfl@users.noreply.github.com>
Date: Sun, 25 Oct 2020 20:25:47 +0100
Subject: [PATCH] Added i18n for interval validation

---
 .../activities/MainActivity.java                          | 8 ++++----
 app/src/main/res/values-de/strings.xml                    | 4 ++++
 app/src/main/res/values/strings.xml                       | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/secuso/privacyfriendlyintervaltimer/activities/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlyintervaltimer/activities/MainActivity.java
index 2ccc4b9..611c3c5 100644
--- a/app/src/main/java/org/secuso/privacyfriendlyintervaltimer/activities/MainActivity.java
+++ b/app/src/main/java/org/secuso/privacyfriendlyintervaltimer/activities/MainActivity.java
@@ -436,9 +436,9 @@ private String formatTime(long seconds){
      */
     private int parseTime(String stringTime) throws NumberFormatException {
         if (stringTime == null)
-            throw new NumberFormatException("parseTimeString null str");
+            throw new NumberFormatException(getString(R.string.main_text_interval_exception_null));
         if (stringTime.isEmpty())
-            throw new NumberFormatException("parseTimeString empty str");
+            throw new NumberFormatException(getString(R.string.main_text_interval_exception_empty));
 
         int minutes, seconds;
 
@@ -447,7 +447,7 @@ private int parseTime(String stringTime) throws NumberFormatException {
 
         // Throw an exception if the string the wrong length
         if (units.length != 2)
-            throw new NumberFormatException("parseTimeString too many sections");
+            throw new NumberFormatException(getString(R.string.main_text_interval_exception_sections));
 
         // Get the sections from the string
         minutes = Integer.parseInt(units[0].trim());
@@ -455,7 +455,7 @@ private int parseTime(String stringTime) throws NumberFormatException {
 
         // Check that the sections are within the correct range
         if ((minutes < 0) || (minutes > 60) || (seconds < 0) || (seconds > 60))
-            throw new NumberFormatException("parseTimeString range error. The values for minutes and seconds must be within [0,60]");
+            throw new NumberFormatException(getString(R.string.main_text_interval_exception_range));
 
         // Return the result
         return (minutes * 60) + seconds;
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d7a522c..e8e0a3c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -24,6 +24,10 @@
     <string name="main_button_disabled_text">Inaktiver Button</string>
     <string name="main_text_work_interval">Trainingsintervall</string>
     <string name="main_text_rest_interval">Pausenintervall</string>
+    <string name="main_text_interval_exception_null">Null ist kein erlaubter Wert</string>
+    <string name="main_text_interval_exception_empty">Der Wert darf nicht leer sein</string>
+    <string name="main_text_interval_exception_sections">Der Wert hat zu viele Abschnitte</string>
+    <string name="main_text_interval_exception_range">Die Werte für Minuten und Sekunden müssen zwischen 0 und 60 liegen</string>
     <string name="main_text_sets">Sätze</string>
     <string name="main_text_start">START  ></string>
     <string name="main_text_title">Bitte wählen:</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db1ece5..bbdcc20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,6 +23,10 @@
     <string name="main_button_disabled_text">Inactive Button</string>
     <string name="main_text_work_interval">Workout Interval</string>
     <string name="main_text_rest_interval">Rest Interval</string>
+    <string name="main_text_interval_exception_null">Null values are not allowed</string>
+    <string name="main_text_interval_exception_empty">Empty values are not allowed</string>
+    <string name="main_text_interval_exception_sections">The value has too many sections</string>
+    <string name="main_text_interval_exception_range">The values for minutes and seconds must be between 0 and 60</string>
     <string name="main_text_sets">Sets</string>
     <string name="main_text_start">START  ></string>
     <string name="main_text_title">Please choose:</string>