Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-20 15:26:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1987 from deltachat/name-quote-only-drafts

Browse Source 
name quote-only drafts as such in the summary
This commit is contained in:
bjoern
2020-10-14 23:23:03 +02:00
committed by GitHub
parent 13055b9c87 d13d62105a
commit e5b0194e8c
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deltachat-ffi/deltachat.h
View File

@@ -5001,6 +5001,7 @@ void dc_event_unref(dc_event_t* event);
#define DC_STR_ERROR_NO_NETWORK 87 #define DC_STR_ERROR_NO_NETWORK 87
#define DC_STR_PROTECTION_ENABLED 88 #define DC_STR_PROTECTION_ENABLED 88
#define DC_STR_PROTECTION_DISABLED 89 #define DC_STR_PROTECTION_DISABLED 89
#define DC_STR_REPLY_NOUN 90 /* eg. "Reply", used in summaries, a noun, not a verb (not: "to reply") */
/* /*
* @} * @}

27
src/message.rs
View File

@@ -998,16 +998,23 @@ impl Lot {
} }
} }
self.text2 = Some( let mut text2 = get_summarytext_by_raw(
get_summarytext_by_raw( msg.viewtype,
msg.viewtype, msg.text.as_ref(),
msg.text.as_ref(), &msg.param,
&msg.param, SUMMARY_CHARACTERS,
SUMMARY_CHARACTERS, context,
context, )
) .await;
.await,
); if text2.is_empty() && msg.quoted_text().is_some() {
text2 = context
.stock_str(StockMessage::ReplyNoun)
.await
.into_owned()
}
self.text2 = Some(text2);
self.timestamp = msg.get_timestamp(); self.timestamp = msg.get_timestamp();
self.state = msg.state.into(); self.state = msg.state.into();

4
src/stock.rs
View File

@@ -240,6 +240,10 @@ pub enum StockMessage {
#[strum(props(fallback = "Chat protection disabled."))] #[strum(props(fallback = "Chat protection disabled."))]
ProtectionDisabled = 89, ProtectionDisabled = 89,
// used in summaries, a noun, not a verb (not: "to reply")
#[strum(props(fallback = "Reply"))]
ReplyNoun = 90,
} }
/* /*