4 files changed, 12 insertions(+), 4 deletions(-)

M image/assets/lang/English.json
M products/BellHybrid/apps/common/src/AlarmModel.cpp
M products/BellHybrid/apps/common/src/TimeUtils.cpp
M products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp

@@ 614,7 614,8 @@
   "app_bell_settings_alarm_settings_snooze_chime_interval_bot_desc": "recurring during\nsnooze",
   "app_bell_settings_alarm_settings_snooze_chime_tone": "Snooze chime tone",
   "app_bell_settings_alarm_settings_snooze_chime_volume": "Snooze chime volume",
-  "app_bellmain_home_screen_bottom_desc": "Next alarm will ring in",
+  "app_bellmain_home_screen_bottom_desc": "Next alarm will ring",
+  "app_bellmain_home_screen_bottom_desc_in": "in",
   "app_bellmain_home_screen_bottom_desc_dp": "Deep press to activate",
   "app_bell_alarm_deactivated": "<text>Alarm deactivated<br /></text>",
   "app_bell_alarm_set_not_active": "<text>Alarm set.<br />Deep press to activate.</text>",

@@ 131,8 131,14 @@ namespace app
 
     AlarmEventRecord AlarmModel::generateDefaultAlarm() const
     {
+        constexpr std::string_view defaultAlarmTime{"07:00:00"};
+
+        auto defaultAlarmTimePoint = TimePointToString(TimePointNow());
+        defaultAlarmTimePoint.replace(
+            defaultAlarmTimePoint.end() - defaultAlarmTime.size(), defaultAlarmTimePoint.end(), defaultAlarmTime);
+
         auto defaultAlarm      = AlarmEventRecord{};
-        defaultAlarm.startDate = TimePointFromString("2021-01-01 07:00:00");
+        defaultAlarm.startDate = TimePointFromString(defaultAlarmTimePoint.c_str());
         defaultAlarm.rruleText = "FREQ=DAILY";
         defaultAlarm.endDate   = TIME_POINT_MAX;
         return defaultAlarm;

@@ 35,6 35,7 @@ namespace utils::time
                 return std::to_string(hours) + " hrs & " + std::to_string(minutes) + " min";
             }
         }(duration.getHours(), duration.getMinutes());
-        return UTF8("<text>" + prefix + "<br />" + "in " + timeText + "</text>");
+        return UTF8("<text>" + prefix + "<br />" + translate("app_bellmain_home_screen_bottom_desc_in") + " " +
+                    timeText + "</text>");
     }
 } // namespace utils::time

@@ 22,11 22,11 @@ namespace gui
                                                                            std::move(presenter))
     {
         getPresenter()->attach(this);
-        buildInterface();
         getPresenter()->updateAlarmModel([&]() {
             setAlarmTime(getPresenter()->getAlarmTime());
             getPresenter()->activate();
         });
+        buildInterface();
 
         timerCallback = [this](Item &, sys::Timer &) {
             returnToPreviousWindow();