The autofollow option is moved from the addons to the core.

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 62db8c8f96d2c0c91c7a3424a8e0eccd5002c797..2ecc2621eb5818f89059d4c491ee1cf2db9b4596 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -99,11 +99,11 @@ function notifications_content(&$a) {
                        'url' => $a->get_baseurl(true) . '/notifications/intros',
                        'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''),
                ),
-               array(
+               /*array(
                        'label' => t('Messages'),
                        'url' => $a->get_baseurl(true) . '/message',
                        'sel'=> '',
-               ),
+               ),*/ /*while I can have notifications for messages, this tablist is not place for message page link */
        );
 
        $o = "";
@@ -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('Approve as: '),
+                                               '$approve_as' => $helptext,
                                                '$as_friend' => t('Friend'),
                                                '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer'))
                                        ));