From 773102e4bd4435bd39c270bd449f0d045075f6e8 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Mon, 1 Dec 2025 13:45:49 +0100 Subject: [PATCH] Fix the French translation of message_content_deleted --- .../Localizable/fr.lproj/Localizable.strings | 4 ++-- .../Conversations/Model/ConversationModel.swift | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Linphone/Localizable/fr.lproj/Localizable.strings b/Linphone/Localizable/fr.lproj/Localizable.strings index 2d10e1209..d9b064b5d 100644 --- a/Linphone/Localizable/fr.lproj/Localizable.strings +++ b/Linphone/Localizable/fr.lproj/Localizable.strings @@ -209,8 +209,8 @@ "conversation_dialog_delete_chat_message_title" = "Supprimer le message ?"; "conversation_dialog_delete_locally_label" = "Pour moi"; "conversation_dialog_delete_for_everyone_label" = "Pour tout le monde"; -"conversation_message_content_deleted_label" = "*Le message a été supprimé*"; -"conversation_message_content_deleted_by_us_label" = "*Vous avez supprimé le message*"; +"conversation_message_content_deleted_label" = "Le message a été supprimé"; +"conversation_message_content_deleted_by_us_label" = "Vous avez supprimé le message"; "conversation_end_to_end_encrypted_bottom_sheet_link" = "https://linphone.org/en/features/#security"; "conversation_end_to_end_encrypted_event_title" = "Conversation chiffrée de bout en bout"; "conversation_end_to_end_encrypted_event_subtitle" = "Les messages de cette conversation sont chiffrés de bout en bout. Seul votre correspondant peut les déchiffrer."; diff --git a/Linphone/UI/Main/Conversations/Model/ConversationModel.swift b/Linphone/UI/Main/Conversations/Model/ConversationModel.swift index 8b5bca791..584e1c7d9 100644 --- a/Linphone/UI/Main/Conversations/Model/ConversationModel.swift +++ b/Linphone/UI/Main/Conversations/Model/ConversationModel.swift @@ -327,14 +327,6 @@ class ConversationModel: ObservableObject, Identifiable { } } - if lastMessage!.isRetracted { - lastMessageTextTmp += lastMessage!.isOutgoing ? String(localized: "conversation_message_content_deleted_by_us_label") : String(localized: "conversation_message_content_deleted_label") - - lastMessageIconTmp = "trash" - - lastMessageInItalicTmp = true - } - if (lastMessage!.contents.first(where: {$0.isFile == true || $0.isFileTransfer == true})?.name != nil) { lastMessageIconTmp = "file" } else if lastMessage!.isReply { @@ -343,6 +335,14 @@ class ConversationModel: ObservableObject, Identifiable { lastMessageIconTmp = "forward" } + if lastMessage!.isRetracted { + lastMessageTextTmp += lastMessage!.isOutgoing ? String(localized: "conversation_message_content_deleted_by_us_label") : String(localized: "conversation_message_content_deleted_label") + + lastMessageIconTmp = "trash" + + lastMessageInItalicTmp = true + } + let lastMessageIsOutgoingTmp = lastMessage?.isOutgoing ?? false let lastUpdateTimeTmp = lastMessage?.time ?? chatRoom.lastUpdateTime