From 2fa9f76e67c59c972bb21449784186892226011f Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 3 Mar 2017 10:28:29 +0100 Subject: [PATCH] better wording and placeholder for name --- mod/notifications.php | 7 +++++-- view/templates/netfriend.tpl | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index e9c04a0c9..0c08b66ce 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -195,11 +195,13 @@ function notifications_content(App $a) { $lbl_knowyou = t('Claims to be known to you: '); $knowyou = (($it['knowyou']) ? t('yes') : t('no')); $helptext = t('Shall your connection be bidirectional or not?'); - $helptext2 = t('"Friend" implies that you allow to read and you subscribe to their posts. "Subscriber" means that you allow to read but you do not want to read theirs. Approve as: '); + $helptext2 = sprintf(t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']); + $helptext3 = sprintf(t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']); } else { $knowyou = ''; $helptext = t('Shall your connection be bidirectional or not?'); - $helptext2 = t('"Friend" implies that you allow to read and you subscribe to their posts. "Sharer" means that you allow to read but you do not want to read theirs. Approve as: '); + $helptext2 = sprintf(t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.'), $it['name'], $it['name']); + $helptext3 = sprintf(t('Accepting %s as a sharer allows them to subscribe to your posts, but you will not receive updates from them in your news feed.'), $it['name']); } } @@ -209,6 +211,7 @@ function notifications_content(App $a) { '$fan_selected' => $fan_selected, '$approve_as1' => $helptext, '$approve_as2' => $helptext2, + '$approve_as3' => $helptext3, '$as_friend' => t('Friend'), '$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Subscriber')) )); diff --git a/view/templates/netfriend.tpl b/view/templates/netfriend.tpl index 169f4e51c..e06d606d4 100644 --- a/view/templates/netfriend.tpl +++ b/view/templates/netfriend.tpl @@ -1,5 +1,5 @@ -
{{$approve_as1}}

{{$approve_as2}}
+
{{$approve_as1}}

{{$approve_as2}}

{{$approve_as3}}