From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 3 Mar 2017 09:28:29 +0000 (+0100)
Subject: better wording and placeholder for name
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2fa9f76e67c59c972bb21449784186892226011f;p=friendica.git

better wording and placeholder for name
---

diff --git a/mod/notifications.php b/mod/notifications.php
index e9c04a0c93..0c08b66ce0 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 169f4e51cd..e06d606d4b 100644
--- 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>