better wording and placeholder for name

diff --git a/mod/notifications.php b/mod/notifications.php
index e9c04a0c9354bd41649a6a9783da567b41420c22..0c08b66ce0459d9b83fbb8bea5a3b760221f79ad 100644 (file)
--- 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 169f4e51cdfbf5c4ba569bedd26940c4ed396f40..e06d606d4b745c42a7cb378d873c6430e4a814d9 100644 (file)
--- a/view/templates/netfriend.tpl
+++ b/view/templates/netfriend.tpl
@@ -1,5 +1,5 @@
 
-<div class="intro-approve-as-friend-desc">{{$approve_as1}}<br /><br />{{$approve_as2}}</div>
+<div class="intro-approve-as-friend-desc">{{$approve_as1}}<br /><br />{{$approve_as2}}<br /><br />{{$approve_as3}}</div>
 
 <div class="intro-approve-as-friend-wrapper">
        <label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label>