strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

change Fan/Admirer to Subscriber

Browse source
This commit is contained in:
Tobias Diekershoff 2017-02-26 16:47:11 +01:00
parent 86c6c48bd8
commit 7442ce3d6d
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mod/notifications.php
View file

@ -194,10 +194,12 @@ function notifications_content(App $a) {
if($it['network'] === NETWORK_DFRN) { if($it['network'] === NETWORK_DFRN) {
$lbl_knowyou = t('Claims to be known to you: '); $lbl_knowyou = t('Claims to be known to you: ');
$knowyou = (($it['knowyou']) ? t('yes') : t('no')); $knowyou = (($it['knowyou']) ? t('yes') : t('no'));
$helptext = t('Shall your connection be bidirectional or not? "Friend" implies that you allow to read and you subscribe to their posts. "Fan/Admirer" means that you allow to read but you do not want to read theirs. Approve as: '); $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: ');
} else { } else {
$knowyou = ''; $knowyou = '';
$helptext = t('Shall your connection be bidirectional or not? "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: '); $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: ');
} }
} }
@ -205,9 +207,10 @@ function notifications_content(App $a) {
'$intro_id' => $it['intro_id'], '$intro_id' => $it['intro_id'],
'$friend_selected' => $friend_selected, '$friend_selected' => $friend_selected,
'$fan_selected' => $fan_selected, '$fan_selected' => $fan_selected,
'$approve_as' => $helptext, '$approve_as1' => $helptext,
'$approve_as2' => $helptext2,
'$as_friend' => t('Friend'), '$as_friend' => t('Friend'),
'$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer')) '$as_fan' => (($it['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Subscriber'))
)); ));
$header = $it["name"]; $header = $it["name"];

2
view/templates/netfriend.tpl
View file

@ -1,5 +1,5 @@
<div class="intro-approve-as-friend-desc">{{$approve_as}}</div> <div class="intro-approve-as-friend-desc">{{$approve_as1}}<br /><br />{{$approve_as2}}</div>
<div class="intro-approve-as-friend-wrapper"> <div class="intro-approve-as-friend-wrapper">
<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label> <label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label>