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

feat: Rephrase "Establishing end-to-end encryption" -> "Establishing connection"

Browse Source
This commit is contained in:
Hocuri
2025-11-14 15:18:33 +01:00
parent 0d0602a4a5
commit c83c131a37
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deltachat-ffi/deltachat.h
View File

@@ -7712,7 +7712,7 @@ void dc_event_unref(dc_event_t* event);
/// Used in summaries. /// Used in summaries.
#define DC_STR_REACTED_BY 177 #define DC_STR_REACTED_BY 177
/// "Establishing guaranteed end-to-end encryption, please wait…" /// "Establishing connection, please wait…"
/// ///
/// Used as info message. /// Used as info message.
#define DC_STR_SECUREJOIN_WAIT 190 #define DC_STR_SECUREJOIN_WAIT 190

2
deltachat-rpc-client/tests/test_securejoin.py
View File

@@ -164,7 +164,7 @@ def test_qr_securejoin_broadcast(acfactory, all_devices_online):
if please_wait_info_msg: if please_wait_info_msg:
first_msg = chat_msgs.pop(0).get_snapshot() first_msg = chat_msgs.pop(0).get_snapshot()
assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…" assert first_msg.text == "Establishing connection, please wait…"
assert first_msg.is_info assert first_msg.is_info
member_added_msg = chat_msgs.pop(0).get_snapshot() member_added_msg = chat_msgs.pop(0).get_snapshot()

2
deltachat-rpc-client/tests/test_something.py
View File

@@ -873,7 +873,7 @@ def test_leave_broadcast(acfactory, all_devices_online):
if please_wait_info_msg: if please_wait_info_msg:
first_msg = chat_msgs.pop(0).get_snapshot() first_msg = chat_msgs.pop(0).get_snapshot()
assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…" assert first_msg.text == "Establishing connection, please wait…"
assert first_msg.is_info assert first_msg.is_info
member_added_msg = chat_msgs.pop(0).get_snapshot() member_added_msg = chat_msgs.pop(0).get_snapshot()

2
src/securejoin/bob.rs
View File

@@ -145,7 +145,7 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
// If we were not in the broadcast channel before, show a 'please wait' info message. // If we were not in the broadcast channel before, show a 'please wait' info message.
// Since we don't have any specific stock string for this, // Since we don't have any specific stock string for this,
// use the generic `Establishing guaranteed end-to-end encryption, please wait…` // use the generic `Establishing connection, please wait…`
if !is_contact_in_chat(context, joining_chat_id, ContactId::SELF).await? { if !is_contact_in_chat(context, joining_chat_id, ContactId::SELF).await? {
let msg = stock_str::securejoin_wait(context).await; let msg = stock_str::securejoin_wait(context).await;
chat::add_info_msg(context, joining_chat_id, &msg).await?; chat::add_info_msg(context, joining_chat_id, &msg).await?;

4
src/stock_str.rs
View File

@@ -392,7 +392,7 @@ pub enum StockMessage {
#[strum(props(fallback = "Member %1$s removed."))] #[strum(props(fallback = "Member %1$s removed."))]
MsgDelMember = 178, MsgDelMember = 178,
#[strum(props(fallback = "Establishing guaranteed end-to-end encryption, please wait…"))] #[strum(props(fallback = "Establishing connection, please wait…"))]
SecurejoinWait = 190, SecurejoinWait = 190,
#[strum(props(fallback = "❤️ Seems you're enjoying Delta Chat! #[strum(props(fallback = "❤️ Seems you're enjoying Delta Chat!
@@ -811,7 +811,7 @@ pub(crate) async fn secure_join_replies(context: &Context, contact_id: ContactId
.replace1(&contact_id.get_stock_name(context).await) .replace1(&contact_id.get_stock_name(context).await)
} }
/// Stock string: `Establishing guaranteed end-to-end encryption, please wait…`. /// Stock string: `Establishing connection, please wait…`.
pub(crate) async fn securejoin_wait(context: &Context) -> String { pub(crate) async fn securejoin_wait(context: &Context) -> String {
translated(context, StockMessage::SecurejoinWait).await translated(context, StockMessage::SecurejoinWait).await
} }

2
test-data/golden/test_broadcast_joining_golden_bob
View File

@@ -1,6 +1,6 @@
InBroadcast#Chat#2002: My Channel [2 member(s)] Icon: e9b6c7a78aa2e4f415644f55a553e73.png InBroadcast#Chat#2002: My Channel [2 member(s)] Icon: e9b6c7a78aa2e4f415644f55a553e73.png
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Msg#2003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO] Msg#2003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO]
Msg#2004: info (Contact#Contact#Info): Establishing guaranteed end-to-end encryption, please wait… [NOTICED][INFO] Msg#2004: info (Contact#Contact#Info): Establishing connection, please wait… [NOTICED][INFO]
Msg#2007🔒: (Contact#Contact#2001): You joined the channel. [FRESH][INFO] Msg#2007🔒: (Contact#Contact#2001): You joined the channel. [FRESH][INFO]
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
test-data/golden/test_sync_broadcast_bob
View File

@@ -1,7 +1,7 @@
InBroadcast#Chat#2002: Channel [1 member(s)] InBroadcast#Chat#2002: Channel [1 member(s)]
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Msg#2003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO] Msg#2003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO]
Msg#2004: info (Contact#Contact#Info): Establishing guaranteed end-to-end encryption, please wait… [NOTICED][INFO] Msg#2004: info (Contact#Contact#Info): Establishing connection, please wait… [NOTICED][INFO]
Msg#2008🔒: (Contact#Contact#2001): You joined the channel. [FRESH][INFO] Msg#2008🔒: (Contact#Contact#2001): You joined the channel. [FRESH][INFO]
Msg#2010🔒: (Contact#Contact#2001): hi [FRESH] Msg#2010🔒: (Contact#Contact#2001): hi [FRESH]
Msg#2011🔒: (Contact#Contact#2001): Member Me removed by alice@example.org. [FRESH][INFO] Msg#2011🔒: (Contact#Contact#2001): Member Me removed by alice@example.org. [FRESH][INFO]