aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-22 23:34:30 -0800
committerfriendica <info@friendica.com>2012-02-22 23:34:30 -0800
commit41636a50aa4fd3f53ad9f9e9d797bfcc37ba8e13 (patch)
tree9b941d37b562480ff89f9d84d6514f40d4ecf7c0 /include
parent808b886a3e18b07c63171c4833334e2cf77ddf71 (diff)
downloadvolse-hubzilla-41636a50aa4fd3f53ad9f9e9d797bfcc37ba8e13.tar.gz
volse-hubzilla-41636a50aa4fd3f53ad9f9e9d797bfcc37ba8e13.tar.bz2
volse-hubzilla-41636a50aa4fd3f53ad9f9e9d797bfcc37ba8e13.zip
new notify sort of working in testbubble
Diffstat (limited to 'include')
-rwxr-xr-xinclude/enotify.php2
-rwxr-xr-xinclude/nav.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/include/enotify.php b/include/enotify.php
index 6af2243f0..1eb3b5476 100755
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -39,7 +39,7 @@ function notification($params) {
$subject = sprintf( t('%s commented on an item at %s'), $params['source_name'], $sitename);
$preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $params['source_name']);
- $epreamble = sprintf( t('%s commented on %s you have been following.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('an item/conversation') . '[/url]');
+ $epreamble = sprintf( t('%s commented in %s.'), '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', '[url=$itemlink]' . t('a watched conversation') . '[/url]');
$sitelink = t('Please visit %s to view and/or reply to the conversation.');
$tsitelink = sprintf( $sitelink, $siteurl );
diff --git a/include/nav.php b/include/nav.php
index c8a44af80..6fee7adb2 100755
--- a/include/nav.php
+++ b/include/nav.php
@@ -116,7 +116,8 @@ function nav(&$a) {
if($_SESSION['page_flags'] == PAGE_NORMAL) {
$nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests'));
$nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications'));
- $nav['notifications']['all']=array('notifications/network', t('See all notifications', "", ""));
+ $nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
+ $nav['notifications']['mark'] = array('', t('Mark all notifications seen'), '','');
}