From bc473088da030f099437be69fa7d6546c49d0918 Mon Sep 17 00:00:00 2001 From: Pawel Olejniczak Date: Thu, 14 Oct 2021 13:23:04 +0200 Subject: [PATCH] [EGD-7339] Correct preparation time unit 60s was displayed instead of 1m. --- image/assets/lang/Svenska.json | 2 +- .../application-meditation/windows/MeditationOptionsWindows.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/image/assets/lang/Svenska.json b/image/assets/lang/Svenska.json index 50239ba8ec0c92eb607b3c679f53326bf7196be4..9a68dbab6215334cb1323488de0a91be0903197d 100644 --- a/image/assets/lang/Svenska.json +++ b/image/assets/lang/Svenska.json @@ -404,7 +404,7 @@ "app_phonebook_uncheck": "AVMARKERA", "app_meditation_title_main": "Meditationsklocka", "app_meditation_preparation_time": "Förbered dig", - "app_meditation_put_down_phone_and_wait": "Sätt ner telefonen
ochvänta på klockslaget.", + "app_meditation_put_down_phone_and_wait": "Sätt ner telefonen
och vänta på klockslaget.", "app_meditation_thank_you_for_session": "Tack för den här
meditationsstunden.", "app_meditation_option_show_counter": "Visa mediationsräknare", "app_meditation_interval_chime": "Klinga då och då", diff --git a/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp b/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp index 66db26421a4da1f097b8698a2e3461ec805e44f7..aee096f0d0af00bcc15609df27b08e9c5c32128f 100644 --- a/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp +++ b/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp @@ -17,7 +17,7 @@ namespace std::string toString(std::chrono::seconds duration) { - if (duration.count() > 60) { + if (duration.count() >= 60) { return std::to_string(static_cast((duration.count()) / 60)) + " m"; } return std::to_string(static_cast(duration.count())) + " s";