~aleteoryx/muditaos

0ae239f2176a77c3bc0e8a25cd7ccf116529b89b — Tomasz Rybarski 4 years ago 695e068
[BH-1121] Alarm Activation Message

Alarm Activation Msg translation change
M image/assets/lang/Deutsch.json => image/assets/lang/Deutsch.json +1 -0
@@ 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",

M image/assets/lang/English.json => image/assets/lang/English.json +1 -0
@@ 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>",

M image/assets/lang/Espanol.json => image/assets/lang/Espanol.json +1 -0
@@ 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",

M image/assets/lang/Francais.json => image/assets/lang/Francais.json +1 -0
@@ 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",

M image/assets/lang/Polski.json => image/assets/lang/Polski.json +3 -1
@@ 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
}

M products/BellHybrid/apps/common/src/TimeUtils.cpp => products/BellHybrid/apps/common/src/TimeUtils.cpp +2 -1
@@ 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") + " " +