Skip to content

Commit 49614a6

Browse files
committed
docs: update instructions to UI where to display the address
1 parent 2f90b55 commit 49614a6

File tree

3 files changed

+28
-31
lines changed

3 files changed

+28
-31
lines changed

deltachat-ffi/deltachat.h

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5321,8 +5321,8 @@ int dc_contact_is_key_contact (dc_contact_t* contact);
53215321
*
53225322
* - If dc_contact_get_verifier_id() != 0,
53235323
* display text "Introduced by ..."
5324-
* with the name and address of the contact
5325-
* formatted by dc_contact_get_name_n_addr().
5324+
* with the name of the contact
5325+
* formatted by dc_contact_get_name().
53265326
* Prefix the text by a green checkmark.
53275327
*
53285328
* - If dc_contact_get_verifier_id() == 0 and dc_contact_is_verified() != 0,
@@ -7370,8 +7370,7 @@ void dc_event_unref(dc_event_t* event);
73707370
/// May be followed by the info-messages
73717371
/// #DC_STR_SECURE_JOIN_REPLIES, #DC_STR_CONTACT_VERIFIED and #DC_STR_MSGADDMEMBER.
73727372
///
7373-
/// `%1$s` will be replaced by name and address of the inviter,
7374-
/// `%2$s` will be replaced by the name of the inviter.
7373+
/// `%1$s` and `%2$s` will be replaced by name of the inviter.
73757374
#define DC_STR_SECURE_JOIN_STARTED 117
73767375

73777376
/// "%1$s replied, waiting for being added to the group…"
@@ -7388,7 +7387,7 @@ void dc_event_unref(dc_event_t* event);
73887387
///
73897388
/// Subtitle for verification qrcode svg image generated by the core.
73907389
///
7391-
/// `%1$s` will be replaced by name and address of the inviter.
7390+
/// `%1$s` will be replaced by name of the inviter.
73927391
#define DC_STR_SETUP_CONTACT_QR_DESC 119
73937392

73947393
/// "Scan to join %1$s"
@@ -7432,15 +7431,15 @@ void dc_event_unref(dc_event_t* event);
74327431
///
74337432
/// `%1$s` will be replaced by the old group name.
74347433
/// `%2$s` will be replaced by the new group name.
7435-
/// `%3$s` will be replaced by name and address of the contact who did the action.
7434+
/// `%3$s` will be replaced by name of the contact who did the action.
74367435
#define DC_STR_GROUP_NAME_CHANGED_BY_OTHER 125
74377436

74387437
/// "You changed the group image."
74397438
#define DC_STR_GROUP_IMAGE_CHANGED_BY_YOU 126
74407439

74417440
/// "Group image changed by %1$s."
74427441
///
7443-
/// `%1$s` will be replaced by name and address of the contact who did the action.
7442+
/// `%1$s` will be replaced by name of the contact who did the action.
74447443
#define DC_STR_GROUP_IMAGE_CHANGED_BY_OTHER 127
74457444

74467445
/// "You added member %1$s."
@@ -7452,23 +7451,23 @@ void dc_event_unref(dc_event_t* event);
74527451

74537452
/// "Member %1$s added by %2$s."
74547453
///
7455-
/// `%1$s` will be replaced by name and address of the contact added to the group.
7456-
/// `%2$s` will be replaced by name and address of the contact who did the action.
7454+
/// `%1$s` will be replaced by name of the contact added to the group.
7455+
/// `%2$s` will be replaced by name of the contact who did the action.
74577456
///
74587457
/// Used in status messages.
74597458
#define DC_STR_ADD_MEMBER_BY_OTHER 129
74607459

74617460
/// "You removed member %1$s."
74627461
///
7463-
/// `%1$s` will be replaced by name and address of the contact removed from the group.
7462+
/// `%1$s` will be replaced by name of the contact removed from the group.
74647463
///
74657464
/// Used in status messages.
74667465
#define DC_STR_REMOVE_MEMBER_BY_YOU 130
74677466

74687467
/// "Member %1$s removed by %2$s."
74697468
///
7470-
/// `%1$s` will be replaced by name and address of the contact removed from the group.
7471-
/// `%2$s` will be replaced by name and address of the contact who did the action.
7469+
/// `%1$s` will be replaced by name of the contact removed from the group.
7470+
/// `%2$s` will be replaced by name of the contact who did the action.
74727471
///
74737472
/// Used in status messages.
74747473
#define DC_STR_REMOVE_MEMBER_BY_OTHER 131
@@ -7480,7 +7479,7 @@ void dc_event_unref(dc_event_t* event);
74807479

74817480
/// "Group left by %1$s."
74827481
///
7483-
/// `%1$s` will be replaced by name and address of the contact.
7482+
/// `%1$s` will be replaced by name of the contact.
74847483
///
74857484
/// Used in status messages.
74867485
#define DC_STR_GROUP_LEFT_BY_OTHER 133
@@ -7492,7 +7491,7 @@ void dc_event_unref(dc_event_t* event);
74927491

74937492
/// "Group image deleted by %1$s."
74947493
///
7495-
/// `%1$s` will be replaced by name and address of the contact.
7494+
/// `%1$s` will be replaced by name of the contact.
74967495
///
74977496
/// Used in status messages.
74987497
#define DC_STR_GROUP_IMAGE_DELETED_BY_OTHER 135
@@ -7504,7 +7503,7 @@ void dc_event_unref(dc_event_t* event);
75047503

75057504
/// "Location streaming enabled by %1$s."
75067505
///
7507-
/// `%1$s` will be replaced by name and address of the contact.
7506+
/// `%1$s` will be replaced by name of the contact.
75087507
///
75097508
/// Used in status messages.
75107509
#define DC_STR_LOCATION_ENABLED_BY_OTHER 137
@@ -7516,7 +7515,7 @@ void dc_event_unref(dc_event_t* event);
75167515

75177516
/// "Message deletion timer is disabled by %1$s."
75187517
///
7519-
/// `%1$s` will be replaced by name and address of the contact.
7518+
/// `%1$s` will be replaced by name of the contact.
75207519
///
75217520
/// Used in status messages.
75227521
#define DC_STR_EPHEMERAL_TIMER_DISABLED_BY_OTHER 139
@@ -7531,7 +7530,7 @@ void dc_event_unref(dc_event_t* event);
75317530
/// "Message deletion timer is set to %1$s s by %2$s."
75327531
///
75337532
/// `%1$s` will be replaced by the number of seconds (always >1) the timer is set to.
7534-
/// `%2$s` will be replaced by name and address of the contact.
7533+
/// `%2$s` will be replaced by name of the contact.
75357534
///
75367535
/// Used in status messages.
75377536
#define DC_STR_EPHEMERAL_TIMER_SECONDS_BY_OTHER 141
@@ -7543,7 +7542,7 @@ void dc_event_unref(dc_event_t* event);
75437542

75447543
/// "Message deletion timer is set to 1 minute by %1$s."
75457544
///
7546-
/// `%1$s` will be replaced by name and address of the contact.
7545+
/// `%1$s` will be replaced by name of the contact.
75477546
/// @deprecated 2025-11-14, this string is no longer needed
75487547
#define DC_STR_EPHEMERAL_TIMER_1_MINUTE_BY_OTHER 143
75497548

@@ -7554,7 +7553,7 @@ void dc_event_unref(dc_event_t* event);
75547553

75557554
/// "Message deletion timer is set to 1 hour by %1$s."
75567555
///
7557-
/// `%1$s` will be replaced by name and address of the contact.
7556+
/// `%1$s` will be replaced by name of the contact.
75587557
///
75597558
/// Used in status messages.
75607559
#define DC_STR_EPHEMERAL_TIMER_1_HOUR_BY_OTHER 145
@@ -7566,7 +7565,7 @@ void dc_event_unref(dc_event_t* event);
75667565

75677566
/// "Message deletion timer is set to 1 day by %1$s."
75687567
///
7569-
/// `%1$s` will be replaced by name and address of the contact.
7568+
/// `%1$s` will be replaced by name of the contact.
75707569
///
75717570
/// Used in status messages.
75727571
#define DC_STR_EPHEMERAL_TIMER_1_DAY_BY_OTHER 147
@@ -7578,7 +7577,7 @@ void dc_event_unref(dc_event_t* event);
75787577

75797578
/// "Message deletion timer is set to 1 week by %1$s."
75807579
///
7581-
/// `%1$s` will be replaced by name and address of the contact.
7580+
/// `%1$s` will be replaced by name of the contact.
75827581
///
75837582
/// Used in status messages.
75847583
#define DC_STR_EPHEMERAL_TIMER_1_WEEK_BY_OTHER 149
@@ -7595,7 +7594,7 @@ void dc_event_unref(dc_event_t* event);
75957594
/// Used in status messages.
75967595
///
75977596
/// `%1$s` will be replaced by the number of minutes (always >1) the timer is set to.
7598-
/// `%2$s` will be replaced by name and address of the contact.
7597+
/// `%2$s` will be replaced by name of the contact.
75997598
#define DC_STR_EPHEMERAL_TIMER_MINUTES_BY_OTHER 151
76007599

76017600
/// "You set message deletion timer to %1$s hours."
@@ -7610,7 +7609,7 @@ void dc_event_unref(dc_event_t* event);
76107609
/// Used in status messages.
76117610
///
76127611
/// `%1$s` will be replaced by the number of hours (always >1) the timer is set to.
7613-
/// `%2$s` will be replaced by name and address of the contact.
7612+
/// `%2$s` will be replaced by name of the contact.
76147613
#define DC_STR_EPHEMERAL_TIMER_HOURS_BY_OTHER 153
76157614

76167615
/// "You set message deletion timer to %1$s days."
@@ -7625,7 +7624,7 @@ void dc_event_unref(dc_event_t* event);
76257624
/// Used in status messages.
76267625
///
76277626
/// `%1$s` will be replaced by the number of days (always >1) the timer is set to.
7628-
/// `%2$s` will be replaced by name and address of the contact.
7627+
/// `%2$s` will be replaced by name of the contact.
76297628
#define DC_STR_EPHEMERAL_TIMER_DAYS_BY_OTHER 155
76307629

76317630
/// "You set message deletion timer to %1$s weeks."
@@ -7640,7 +7639,7 @@ void dc_event_unref(dc_event_t* event);
76407639
/// Used in status messages.
76417640
///
76427641
/// `%1$s` will be replaced by the number of weeks (always >1) the timer is set to.
7643-
/// `%2$s` will be replaced by name and address of the contact.
7642+
/// `%2$s` will be replaced by name of the contact.
76447643
#define DC_STR_EPHEMERAL_TIMER_WEEKS_BY_OTHER 157
76457644

76467645
/// "You set message deletion timer to 1 year."
@@ -7650,14 +7649,14 @@ void dc_event_unref(dc_event_t* event);
76507649

76517650
/// "Message deletion timer is set to 1 year by %1$s."
76527651
///
7653-
/// `%1$s` will be replaced by name and address of the contact.
7652+
/// `%1$s` will be replaced by name of the contact.
76547653
///
76557654
/// Used in status messages.
76567655
#define DC_STR_EPHEMERAL_TIMER_1_YEAR_BY_OTHER 159
76577656

76587657
/// "Scan to set up second device for %1$s"
76597658
///
7660-
/// `%1$s` will be replaced by name and address of the account.
7659+
/// `%1$s` will be replaced by name of the account.
76617660
#define DC_STR_BACKUP_TRANSFER_QR 162
76627661

76637662
/// "Account transferred to your second device."

deltachat-jsonrpc/src/api/types/contact.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ pub struct ContactObject {
4747
///
4848
/// - If `verifierId` != 0,
4949
/// display text "Introduced by ..."
50-
/// with the name and address of the contact
51-
/// formatted by `name_and_addr`/`nameAndAddr`.
50+
/// with the name of the contact.
5251
/// Prefix the text by a green checkmark.
5352
///
5453
/// - If `verifierId` == 0 and `isVerified` != 0,

src/contact.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,8 +1635,7 @@ impl Contact {
16351635
///
16361636
/// If this returns Some(_),
16371637
/// display green checkmark in the profile and "Introduced by ..." line
1638-
/// with the name and address of the contact
1639-
/// formatted by [Self::get_name_n_addr].
1638+
/// with the name of the contact.
16401639
///
16411640
/// If this returns `Some(None)`, then the contact is verified,
16421641
/// but it's unclear by whom.

0 commit comments

Comments
 (0)