From 0ae239f2176a77c3bc0e8a25cd7ccf116529b89b Mon Sep 17 00:00:00 2001
From: Tomasz Rybarski <tomasz.rybarski@digica.com>
Date: Fri, 29 Oct 2021 11:09:41 +0200
Subject: [PATCH] [BH-1121] Alarm Activation Message

Alarm Activation Msg translation change
---
 image/assets/lang/Deutsch.json                    | 1 +
 image/assets/lang/English.json                    | 1 +
 image/assets/lang/Espanol.json                    | 1 +
 image/assets/lang/Francais.json                   | 1 +
 image/assets/lang/Polski.json                     | 4 +++-
 products/BellHybrid/apps/common/src/TimeUtils.cpp | 3 ++-
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/image/assets/lang/Deutsch.json b/image/assets/lang/Deutsch.json
index 13a4a9d12eeb310b12948f4841e523570a55a528..2b1e936fc216ea710302e6568cd0e3c8e6629743 100644
--- a/image/assets/lang/Deutsch.json
+++ b/image/assets/lang/Deutsch.json
@@ -611,6 +611,7 @@
   "app_bellmain_home_screen_bottom_desc_dp": "Tief drücken, um zu aktivieren",
   "app_bellmain_home_screen_bottom_desc": "Der nächste Alarm klingelt",
   "app_bellmain_home_screen_bottom_desc_in": "in",
+  "app_bellmain_home_screen_bottom_desc_and": "&",
   "app_bell_alarm_deactivated": "Alarm deaktiviert",
   "app_bellmain_alarm": "Alarm",
   "app_bellmain_power_nap": "Kraft-Schläfchen",
diff --git a/image/assets/lang/English.json b/image/assets/lang/English.json
index 4decee6a64afacde9284305f8fb162428deb9390..1f3f61d9f0b3537e08900f364a82caa2c7401fd9 100644
--- a/image/assets/lang/English.json
+++ b/image/assets/lang/English.json
@@ -642,6 +642,7 @@
   "app_bell_settings_alarm_settings_snooze_chime_volume": "Snooze chime volume",
   "app_bellmain_home_screen_bottom_desc": "Next alarm will ring",
   "app_bellmain_home_screen_bottom_desc_in": "in",
+  "app_bellmain_home_screen_bottom_desc_and": "&",
   "app_bellmain_home_screen_bottom_desc_less_than": "less than",
   "app_bellmain_home_screen_bottom_desc_dp": "Deep press to activate",
   "app_bell_alarm_deactivated": "<text>Alarm deactivated</text>",
diff --git a/image/assets/lang/Espanol.json b/image/assets/lang/Espanol.json
index 03b2a43838adfe62e6de67db1ecef29226d4c625..19bb29452674c0f17dd998beba6deab2ab61207b 100644
--- a/image/assets/lang/Espanol.json
+++ b/image/assets/lang/Espanol.json
@@ -603,6 +603,7 @@
   "tethering_menu_access_decline": "<text>El anclaje de red está activado.<br /><br />Para acceder al menú,<br />desactiva el tethering.</text>",
   "app_bellmain_home_screen_bottom_desc": "La siguiente alarma sonará",
   "app_bellmain_home_screen_bottom_desc_in": "en",
+  "app_bellmain_home_screen_bottom_desc_and": "&",
   "app_bell_alarm_deactivated": "Alarma desactivada",
   "app_bell_turn_off_question": "¿Apagar Mudita Harmony?",
   "app_bell_goodbye": "Adiós",
diff --git a/image/assets/lang/Francais.json b/image/assets/lang/Francais.json
index 6cb3d083a5c3d63ec81a2e107ed3fbc8a3af7c42..46283adfd981c9627f4f0309fb7d18f379d399ad 100644
--- a/image/assets/lang/Francais.json
+++ b/image/assets/lang/Francais.json
@@ -577,6 +577,7 @@
   "app_bellmain_power_nap": "Sieste éclair",
   "app_bellmain_home_screen_bottom_desc": "La prochaine alarme sonnera",
   "app_bellmain_home_screen_bottom_desc_in": "dans",
+  "app_bellmain_home_screen_bottom_desc_and": "&",
   "app_bell_alarm_deactivated": "Alarme désactivée",
   "app_bell_turn_off_question": "Éteindre l'appareil ?",
   "app_bell_goodbye": "Au revoir",
diff --git a/image/assets/lang/Polski.json b/image/assets/lang/Polski.json
index 4650bd567cde1cdd33c73ac4ff9f3b52b974b4d5..908196c33bfa8b8bdf2a910456a813d840f2b84c 100644
--- a/image/assets/lang/Polski.json
+++ b/image/assets/lang/Polski.json
@@ -647,6 +647,8 @@
   "app_bell_settings_alarm_settings_snooze_chime_volume": "Głośność",
   "app_bellmain_home_screen_bottom_desc": "Następny alarm zadzwoni",
   "app_bellmain_home_screen_bottom_desc_in": "za",
+  "app_bellmain_home_screen_bottom_desc_less_than": "mniej niż",
+  "app_bellmain_home_screen_bottom_desc_and": "i",
   "app_bellmain_home_screen_bottom_desc_dp": "Naciśnij głęboko, aby aktywować",
   "app_bell_alarm_deactivated": "Alarm wyłączony",
   "app_bell_settings_advanced_frontlight": "Podświetlenie",
@@ -690,4 +692,4 @@
   "app_bell_meditation_interval_every_x_minutes": "co %0 minuty",
   "app_bell_meditation_put_down_and_wait": "<text>Odłóż Mudita Harmony<br>i czekaj na gong</text>",
   "app_bell_meditation_thank_you_for_session": "<text>Dziękujemy<br>za sesję</text>"
-}
\ No newline at end of file
+}
diff --git a/products/BellHybrid/apps/common/src/TimeUtils.cpp b/products/BellHybrid/apps/common/src/TimeUtils.cpp
index 6054fe8407ff6e93df8f4b014bf372fe49ea0809..87274197a34dda7effc43d7d8b1ec1d38b75e066 100644
--- a/products/BellHybrid/apps/common/src/TimeUtils.cpp
+++ b/products/BellHybrid/apps/common/src/TimeUtils.cpp
@@ -44,7 +44,8 @@ namespace utils::time
                 return std::to_string(hours) + " h";
             }
             else {
-                return std::to_string(hours) + " h & " + std::to_string(minutes) + " min";
+                return std::to_string(hours) + " h " + translate("app_bellmain_home_screen_bottom_desc_and") + " " +
+                       std::to_string(minutes) + " min";
             }
         }(duration.getHours(), duration.getMinutes());
         return UTF8("<text>" + prefix + "<br />" + translate("app_bellmain_home_screen_bottom_desc_in") + " " +