From efe53eb0340c412aaa0e5f3fc54dd61abf670d3c Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Sat, 6 May 2017 18:08:28 +0200
Subject: [PATCH] Fix translation for audio files (#4889)

Switch the time mechanic to english one (may not be perfect, but current italian is not working at all)
---
 radio/src/translations/tts_it.cpp | 63 ++++++++-----------------------
 radio/util/tts_it.py              |  6 +--
 2 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp
index ecac135af..33a417be3 100644
--- a/radio/src/translations/tts_it.cpp
+++ b/radio/src/translations/tts_it.cpp
@@ -179,63 +179,32 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
 
 I18N_PLAY_FUNCTION(it, playDuration, int seconds PLAY_DURATION_ATT)
 {
+  if (seconds == 0) {
+    PLAY_NUMBER(seconds, 0, 0);
+    return;
+  }
+
   if (seconds < 0) {
     PUSH_NUMBER_PROMPT(IT_PROMPT_MENO);
     seconds = -seconds;
   }
 
-  uint8_t ore = 0;
   uint8_t tmp = seconds / 3600;
   seconds %= 3600;
+  if (tmp > 0 || IS_PLAY_TIME()) {
+    PLAY_NUMBER(tmp, UNIT_HOURS, 0);
+  }
+
+  tmp = seconds / 60;
+  seconds %= 60;
   if (tmp > 0) {
-    ore=tmp;
-    if (tmp > 1 || IS_PLAY_TIME()) {
-#if defined(CPUARM)
-      PLAY_NUMBER(tmp, UNIT_HOURS, 0);
-#else
-      PLAY_NUMBER(tmp, 0, 0);
-      PUSH_NUMBER_PROMPT(IT_PROMPT_ORE);
-    } else {
-      PUSH_NUMBER_PROMPT(IT_PROMPT_UN);
-      PUSH_NUMBER_PROMPT(IT_PROMPT_ORA);
-#endif
-    }
-  }
-  if (seconds>0) {
-    tmp = seconds / 60;
-    seconds %= 60;
-    if (tmp>0 && seconds==0 && ore>0) {
+    PLAY_NUMBER(tmp, UNIT_MINUTES, 0);
+    if (seconds > 0)
       PUSH_NUMBER_PROMPT(IT_PROMPT_E);
-    }
-    if (tmp > 0) {
-      if (tmp != 1) {
-#if defined(CPUARM)
-      PLAY_NUMBER(tmp, UNIT_MINUTES, 0);
-#else
-        PLAY_NUMBER(tmp, 0, 0);
-        PUSH_NUMBER_PROMPT(IT_PROMPT_MINUTI);
-      } else {
-        PUSH_NUMBER_PROMPT(IT_PROMPT_UN);
-        PUSH_NUMBER_PROMPT(IT_PROMPT_MINUTO);
-#endif
-      }
-    }
-    if ((tmp>0 || ore>0) && seconds>0) {
-      PUSH_NUMBER_PROMPT(IT_PROMPT_E);
-    }
   }
-  if (seconds != 0 || (ore==0 && tmp==0)) {
-    if (seconds != 1) {
-#if defined(CPUARM)
-      PLAY_NUMBER(tmp, UNIT_SECONDS, 0);
-#else
-      PLAY_NUMBER(seconds, 0, 0);
-      PUSH_NUMBER_PROMPT(IT_PROMPT_SECONDI);
-    } else {
-      PUSH_NUMBER_PROMPT(IT_PROMPT_UN);
-      PUSH_NUMBER_PROMPT(IT_PROMPT_SECONDO);
-#endif
-    }
+
+  if (seconds > 0) {
+    PLAY_NUMBER(seconds, UNIT_SECONDS, 0);
   }
 }
 
diff --git a/radio/util/tts_it.py b/radio/util/tts_it.py
index 1ecf94340..6df6c9e05 100755
--- a/radio/util/tts_it.py
+++ b/radio/util/tts_it.py
@@ -37,9 +37,9 @@ for i, (s, f) in enumerate([(u"volt", "volt0"),
                             (u"radian", "rad0"), ("radians", "rad1"),
                             (u"millilitro", "m10"), ("millilitri", "m11"),
                             (u"oncia", "founce0"), ("once", "founce1"),
-                            (u"hour", "hour0"), ("hours", "hour1"),
-                            (u"minute", "minute0"), ("minutes", "minute1"),
-                            (u"second", "second0"), ("seconds", "second1"),
+                            (u"ora", "hour0"), ("ore", "hour1"),
+                            (u"minuto", "minute0"), ("minuti", "minute1"),
+                            (u"secondo", "second0"), ("secondi", "second1"),
                             ]):
     systemSounds.append((s, filename(f, PROMPT_SYSTEM_BASE + 113 + i)))
 for s, f, a in [(u"radio inattiva controllare", "inactiv", 486),