Browse Source

Merge pull request #1474 from fabrixxm/silke-helptext

Connection approval help text, issue #1349, based on pull request #1463
pull/1476/head
fabrixxm 7 years ago
parent
commit
ab5540e1f0
  1. 10
      mod/notifications.php
  2. 8430
      util/messages.po

10
mod/notifications.php

@ -177,15 +177,19 @@ function notifications_content(&$a) {
$dfrn_text = '';
if($rr['network'] === NETWORK_DFRN || $rr['network'] === NETWORK_DIASPORA) {
if($rr['network'] === NETWORK_DFRN)
if($rr['network'] === NETWORK_DFRN) {
$knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no'));
else
$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: ');
} else {
$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: ');
}
$dfrn_text = replace_macros($dfrn_tpl,array(
'$intro_id' => $rr['intro_id'],
'$friend_selected' => $friend_selected,
'$fan_selected' => $fan_selected,
'$approve_as' => t('Choose "Friend" to allow to read and to subscribe to their posts. Choose "Fan" to allow to read if you do not want to read their posts. Approve as: '),
'$approve_as' => $helptext,
'$as_friend' => t('Friend'),
'$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer'))
));

8430
util/messages.po
File diff suppressed because it is too large
View File

Loading…
Cancel
Save