From c8ad07c3c00c5c41e81af4b54a5965f9b3551559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Zieli=C5=84ski?= Date: Mon, 8 May 2023 20:16:20 +0200 Subject: [PATCH] [MOS-578] Fix misleading SMS notification text Display "New message", translated accordingly - in singular - in case there had been multiple unread SMS messages and now only one remains unread. --- image/system_a/data/lang/Deutsch.json | 1 + image/system_a/data/lang/English.json | 3 ++- image/system_a/data/lang/Espanol.json | 1 + image/system_a/data/lang/Francais.json | 1 + image/system_a/data/lang/Polski.json | 1 + image/system_a/data/lang/Svenska.json | 3 ++- .../apps-common/notifications/NotificationsListPresenter.cpp | 5 ++++- pure_changelog.md | 1 + 8 files changed, 13 insertions(+), 3 deletions(-) diff --git a/image/system_a/data/lang/Deutsch.json b/image/system_a/data/lang/Deutsch.json index 6d6e1fdb5bea724fceadfbb8aef9f9620d083201..0afa084cefc3d36a4e2f94d31064cca00a138348 100644 --- a/image/system_a/data/lang/Deutsch.json +++ b/image/system_a/data/lang/Deutsch.json @@ -274,6 +274,7 @@ "app_desktop_tools_title": "Werkzeuge", "app_desktop_unlock": "ENTSPERREN", "app_desktop_unread_messages": "Ungelesene Nachrichten", + "app_desktop_unread_single_message": "Ungelesene Nachricht", "app_emoji_input_window": "Emoji", "app_meditation_countdown_desc": "Beginnt in", "app_meditation_interval_chime": "Glocken-Intervall", diff --git a/image/system_a/data/lang/English.json b/image/system_a/data/lang/English.json index 46b3b866602ad5992e40dc381feb84ec53c11dc5..2022661bb12f3142453e22e65ba4a4fb7e49055c 100644 --- a/image/system_a/data/lang/English.json +++ b/image/system_a/data/lang/English.json @@ -277,6 +277,7 @@ "app_desktop_tools_title": "Tools", "app_desktop_unlock": "UNLOCK", "app_desktop_unread_messages": "Unread messages", + "app_desktop_unread_single_message": "Unread message", "app_emoji_input_window": "Emoji", "app_meditation_countdown_desc": "Starts in", "app_meditation_interval_chime": "Interval chime", @@ -721,4 +722,4 @@ "tethering_menu_access_decline": "Tethering is on.

To access menu,
turn tethering off.", "tethering_phone_mode_change_prohibited": "Tethering is on.

Other modes (Connected, DND,
Offline) are overriden by this mode
and are not working.", "tethering_turn_off_question": "Turn tethering off?" -} \ No newline at end of file +} diff --git a/image/system_a/data/lang/Espanol.json b/image/system_a/data/lang/Espanol.json index b70ff72e783866bfc1ade38e78dd3e8b286c12d6..ea189e2d131b77bd9280351705b777e556c5a5e7 100644 --- a/image/system_a/data/lang/Espanol.json +++ b/image/system_a/data/lang/Espanol.json @@ -273,6 +273,7 @@ "app_desktop_tools_title": "Herramientas", "app_desktop_unlock": "DESBLOQUEAR", "app_desktop_unread_messages": "Mensajes no le\u00eddos", + "app_desktop_unread_single_message": "Mensaje no le\u00eddo", "app_emoji_input_window": "Emoji", "app_meditation_countdown_desc": "Empieza en", "app_meditation_interval_chime": "Campanilla de intervalo", diff --git a/image/system_a/data/lang/Francais.json b/image/system_a/data/lang/Francais.json index d9df95acc6a8d3f952ce08331676291b44e78118..f73d53401d698ba7eefc416fa9abc3bf42965d84 100644 --- a/image/system_a/data/lang/Francais.json +++ b/image/system_a/data/lang/Francais.json @@ -241,6 +241,7 @@ "app_desktop_tools_title": "Outils", "app_desktop_unlock": "D\u00c9V\u00c9ROUILLER", "app_desktop_unread_messages": "Messages non lus", + "app_desktop_unread_single_message": "Message non lu", "app_emoji_input_window": "Emoji", "app_meditation_countdown_desc": "D\u00e9but dans", "app_meditation_interval_chime": "Carillon d'intervalle", diff --git a/image/system_a/data/lang/Polski.json b/image/system_a/data/lang/Polski.json index f0e3f1818a3ea4080ad949d3477ea7964f846c2e..abb9a35f5945a1c213435524d2d53046e21f3ed1 100644 --- a/image/system_a/data/lang/Polski.json +++ b/image/system_a/data/lang/Polski.json @@ -266,6 +266,7 @@ "app_desktop_tools_title": "Narz\u0119dzia", "app_desktop_unlock": "ODBLOKUJ", "app_desktop_unread_messages": "Nowe wiadomo\u015bci", + "app_desktop_unread_single_message": "Nowa wiadomo\u015b\u0107", "app_emoji_input_window": "Emoji", "app_meditation_countdown_desc": "Startuje za", "app_meditation_interval_chime": "Cykliczny d\u017awi\u0119k", diff --git a/image/system_a/data/lang/Svenska.json b/image/system_a/data/lang/Svenska.json index f5fce10a8782aefc66a4ea9761422176b0bd760b..6fc63ff6e9baa290974c9cb5b71e90f131e824da 100644 --- a/image/system_a/data/lang/Svenska.json +++ b/image/system_a/data/lang/Svenska.json @@ -144,6 +144,7 @@ "app_desktop_tools_title": "Verktyg", "app_desktop_unlock": "L\u00c5S UPP", "app_desktop_unread_messages": "Ol\u00e4sta meddelanden", + "app_desktop_unread_single_message": "Ol\u00e4st meddelande", "app_emoji_input_window": "Emoji", "app_meditation_interval_chime": "Klinga d\u00e5 och d\u00e5", "app_meditation_interval_every_x_minutes": "Var %0:e minut", @@ -523,4 +524,4 @@ "tethering_phone_mode_change_prohibited": "Internetdelning \u00e4r p\u00e5.

Andra l\u00e4gen (ansluten, DND,
offline) \u00e5sidos\u00e4tts av detta
l\u00e4ge och fungerar inte.", "tethering_turn_off_question": "St\u00e4nga av Internetdelning?", "volume_text": "LJUDVOLYM" -} \ No newline at end of file +} diff --git a/module-apps/apps-common/notifications/NotificationsListPresenter.cpp b/module-apps/apps-common/notifications/NotificationsListPresenter.cpp index f8e5b7158b074a1c6600550fd6ab7b1773cdf3a3..727987778bb57934cfed822d05826f42e257eacc 100644 --- a/module-apps/apps-common/notifications/NotificationsListPresenter.cpp +++ b/module-apps/apps-common/notifications/NotificationsListPresenter.cpp @@ -77,7 +77,10 @@ auto NotificationsListPresenter::create(const notifications::NotSeenSMSNotificat -> NotificationListItem * { auto item = new NotificationWithEventCounter(notifications::NotificationType::NotSeenSms, notification->getValue()); - setNotificationText(item, notification, "app_desktop_unread_messages"); + setNotificationText(item, + notification, + (notification->getValue() == 1) ? "app_desktop_unread_single_message" + : "app_desktop_unread_messages"); item->deleteByList = false; return item; } diff --git a/pure_changelog.md b/pure_changelog.md index c904185a77f1f4eb9228fad6ad9e558583580f07..d8e0357ef61058eb33abc34d219dbc298fbc5a2d 100644 --- a/pure_changelog.md +++ b/pure_changelog.md @@ -40,6 +40,7 @@ * Fixed unresponsive Templates window for user input after templates were changed via MC. * Fixed USB charging port detection. * Fixed Template window clearing after all templates are removed. +* Fixed wrong notification about multiple unread messages in case there's only one unread left ## [1.7.0 2023-03-23] ### Changed / Improved