M image/assets/lang/Deutsch.json => image/assets/lang/Deutsch.json +0 -1
@@ 612,7 612,6 @@
"sms_delete_message": "Nachricht löschen",
"sms_use_template": "Vorlage verwenden",
"sms_paste": "Einfügen",
- "sms_temp_reply": "Antworten",
"sms_mark_read": "Als gelesen markieren",
"sms_mark_unread": "Als ungelesen markieren",
"app_desktop_update": "Aktualisierung",
M image/assets/lang/English.json => image/assets/lang/English.json +0 -1
@@ 586,7 586,6 @@
"sms_delete_message": "Delete message",
"sms_use_template": "Use template",
"sms_paste": "Paste",
- "sms_temp_reply": "Reply",
"sms_mark_read": "Mark as read",
"sms_mark_unread": "Mark as unread",
"app_desktop_update": "Update",
M image/assets/lang/Espanol.json => image/assets/lang/Espanol.json +0 -1
@@ 613,7 613,6 @@
"sms_delete_message": "Eliminar mensaje",
"sms_use_template": "Usar plantilla",
"sms_paste": "Pegar",
- "sms_temp_reply": "Responder",
"sms_mark_read": "Marcar como leído",
"sms_mark_unread": "Marcar como no leído",
"app_desktop_update": "Actualizar",
M image/assets/lang/Francais.json => image/assets/lang/Francais.json +0 -1
@@ 581,7 581,6 @@
"sms_delete_message": "Supprimer le message",
"sms_use_template": "Utiliser le modèle",
"sms_paste": "Coller",
- "sms_temp_reply": "Réponse",
"sms_mark_read": "Marquer comme lu",
"sms_mark_unread": "Marquer comme non lu",
"app_desktop_update": "Mettre à jour",
M image/assets/lang/Polski.json => image/assets/lang/Polski.json +0 -1
@@ 630,7 630,6 @@
"sms_delete_message": "Usuń wiadomość",
"sms_use_template": "Użyj szablonu",
"sms_paste": "Wklej",
- "sms_temp_reply": "Odpowiedz",
"sms_mark_read": "Oznacz jako przeczytaną",
"sms_mark_unread": "Oznacz jako nieprzeczytaną",
"app_desktop_update": "Aktualizuj",
M image/assets/lang/Svenska.json => image/assets/lang/Svenska.json +0 -1
@@ 516,7 516,6 @@
"sms_delete_message": "Radera meddelande",
"sms_use_template": "Använd mall",
"sms_paste": "Klistra in",
- "sms_temp_reply": "Svara",
"sms_mark_read": "Markera som läst",
"sms_mark_unread": "Markera som oläst",
"app_desktop_update": "Uppdatera",
M module-apps/application-messages/widgets/SMSInputWidget.cpp => module-apps/application-messages/widgets/SMSInputWidget.cpp +8 -25
@@ 1,4 1,4 @@
-// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved.
// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
#include "ApplicationMessages.hpp"
@@ 72,28 72,15 @@ namespace gui
assert(body != nullptr);
assert(application != nullptr);
- if (inputText->focus) {
-
- application->getWindow(gui::name::window::thread_view)
- ->setNavBarText(utils::translate(utils::translate(style::strings::common::send)),
- nav_bar::Side::Center);
-
- if (inputText->getText() == utils::translate("sms_temp_reply")) {
- inputText->clear();
- }
+ const auto threadViewWindow = application->getWindow(gui::name::window::thread_view);
+ if (inputText->focus) {
inputText->setCursorStartPosition(CursorStartPosition::DocumentEnd);
+ threadViewWindow->setNavBarText(utils::translate(utils::translate(style::strings::common::send)),
+ nav_bar::Side::Center);
}
else {
-
- if (inputText->isEmpty()) {
-
- inputText->setColor(Color(7, 0));
- inputText->setText(utils::translate("sms_temp_reply"));
- }
-
- application->getWindow(gui::name::window::thread_view)
- ->setNavBarText(utils::translate(style::strings::common::reply), nav_bar::Side::Center);
+ threadViewWindow->setNavBarText(utils::translate(style::strings::common::reply), nav_bar::Side::Center);
}
return true;
@@ 117,12 104,8 @@ namespace gui
void SMSInputWidget::handleDraftMessage()
{
- if (const auto &text = inputText->getText(); text.empty() || (text == utils::translate("sms_temp_reply"))) {
- clearDraftMessage();
- }
- else {
- updateDraftMessage(text);
- }
+ const auto &text = inputText->getText();
+ text.empty() ? clearDraftMessage() : updateDraftMessage(text);
}
void SMSInputWidget::clearDraftMessage()
M pure_changelog.md => pure_changelog.md +1 -0
@@ 15,6 15,7 @@
* Fixed backspace behavior in text edit
* Fixed text not showing when adding/editing contact if text began with 'j' glyph
* Fixed VoLTE switch availability after taking out SIM card
+* Fixed improper message text displaying after pasting from clipboard
### Added