Skip to content

Commit c83c131

Browse files
committed
feat: Rephrase "Establishing end-to-end encryption" -> "Establishing connection"
1 parent 0d0602a commit c83c131

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

deltachat-ffi/deltachat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7712,7 +7712,7 @@ void dc_event_unref(dc_event_t* event);
77127712
/// Used in summaries.
77137713
#define DC_STR_REACTED_BY 177
77147714

7715-
/// "Establishing guaranteed end-to-end encryption, please wait…"
7715+
/// "Establishing connection, please wait…"
77167716
///
77177717
/// Used as info message.
77187718
#define DC_STR_SECUREJOIN_WAIT 190

deltachat-rpc-client/tests/test_securejoin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def check_account(ac, contact, inviter_side, please_wait_info_msg=False):
164164

165165
if please_wait_info_msg:
166166
first_msg = chat_msgs.pop(0).get_snapshot()
167-
assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…"
167+
assert first_msg.text == "Establishing connection, please wait…"
168168
assert first_msg.is_info
169169

170170
member_added_msg = chat_msgs.pop(0).get_snapshot()

deltachat-rpc-client/tests/test_something.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ def check_account(ac, contact, inviter_side, please_wait_info_msg=False):
873873

874874
if please_wait_info_msg:
875875
first_msg = chat_msgs.pop(0).get_snapshot()
876-
assert first_msg.text == "Establishing guaranteed end-to-end encryption, please wait…"
876+
assert first_msg.text == "Establishing connection, please wait…"
877877
assert first_msg.is_info
878878

879879
member_added_msg = chat_msgs.pop(0).get_snapshot()

src/securejoin/bob.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ pub(super) async fn start_protocol(context: &Context, invite: QrInvite) -> Resul
145145

146146
// If we were not in the broadcast channel before, show a 'please wait' info message.
147147
// Since we don't have any specific stock string for this,
148-
// use the generic `Establishing guaranteed end-to-end encryption, please wait…`
148+
// use the generic `Establishing connection, please wait…`
149149
if !is_contact_in_chat(context, joining_chat_id, ContactId::SELF).await? {
150150
let msg = stock_str::securejoin_wait(context).await;
151151
chat::add_info_msg(context, joining_chat_id, &msg).await?;

src/stock_str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ pub enum StockMessage {
392392
#[strum(props(fallback = "Member %1$s removed."))]
393393
MsgDelMember = 178,
394394

395-
#[strum(props(fallback = "Establishing guaranteed end-to-end encryption, please wait…"))]
395+
#[strum(props(fallback = "Establishing connection, please wait…"))]
396396
SecurejoinWait = 190,
397397

398398
#[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
811811
.replace1(&contact_id.get_stock_name(context).await)
812812
}
813813

814-
/// Stock string: `Establishing guaranteed end-to-end encryption, please wait…`.
814+
/// Stock string: `Establishing connection, please wait…`.
815815
pub(crate) async fn securejoin_wait(context: &Context) -> String {
816816
translated(context, StockMessage::SecurejoinWait).await
817817
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
InBroadcast#Chat#2002: My Channel [2 member(s)] Icon: e9b6c7a78aa2e4f415644f55a553e73.png
22
--------------------------------------------------------------------------------
33
Msg#2003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO]
4-
Msg#2004: info (Contact#Contact#Info): Establishing guaranteed end-to-end encryption, please wait… [NOTICED][INFO]
4+
Msg#2004: info (Contact#Contact#Info): Establishing connection, please wait… [NOTICED][INFO]
55
Msg#2007🔒: (Contact#Contact#2001): You joined the channel. [FRESH][INFO]
66
--------------------------------------------------------------------------------

test-data/golden/test_sync_broadcast_bob

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
InBroadcast#Chat#2002: Channel [1 member(s)]
22
--------------------------------------------------------------------------------
33
Msg#2003: info (Contact#Contact#Info): Messages are end-to-end encrypted. [NOTICED][INFO]
4-
Msg#2004: info (Contact#Contact#Info): Establishing guaranteed end-to-end encryption, please wait… [NOTICED][INFO]
4+
Msg#2004: info (Contact#Contact#Info): Establishing connection, please wait… [NOTICED][INFO]
55
Msg#2008🔒: (Contact#Contact#2001): You joined the channel. [FRESH][INFO]
66
Msg#2010🔒: (Contact#Contact#2001): hi [FRESH]
77
Msg#2011🔒: (Contact#Contact#2001): Member Me removed by alice@example.org. [FRESH][INFO]

0 commit comments

Comments
 (0)