system notifications to notify module, untranslated string in notifications.tpl

diff --git a/mod/notifications.php b/mod/notifications.php
index 5831c1b7ab418bee23406452cf60b2c2c5c8896f..99031a1d59f0dee8a2050e08def1082dc0f1cf98 100755 (executable)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -295,7 +295,7 @@ function notifications_content(&$a) {
                }
                
                $o .= replace_macros($notif_tpl,array(
-                       '$notif_header' => t('Notifications'),
+                       '$notif_header' => t('Network Notifications'),
                        '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
@@ -325,7 +325,7 @@ function notifications_content(&$a) {
                }
                
                $o .= replace_macros($notif_tpl,array(
-                       '$notif_header' => t('System'),
+                       '$notif_header' => t('System Notifications'),
                        '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
@@ -420,7 +420,7 @@ function notifications_content(&$a) {
                }
                
                $o .= replace_macros($notif_tpl,array(
-                       '$notif_header' => t('Notifications'),
+                       '$notif_header' => t('Personal Notifications'),
                        '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));
@@ -501,7 +501,7 @@ function notifications_content(&$a) {
                }
                
                $o .= replace_macros($notif_tpl,array(
-                       '$notif_header' => t('Notifications'),
+                       '$notif_header' => t('Home Notifications'),
                        '$tabs' => $tabs,
                        '$notif_content' => $notif_content,
                ));

diff --git a/mod/notify.php b/mod/notify.php
index 229020f4a715df876d44c1b44cc44734009e3bc3..e6a7a885966418d35c9dcf163410c8dfe74e1cfe 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -36,4 +36,36 @@ function notify_init(&$a) {
 function notify_content(&$a) {
        if(! local_user())
                return login();
+
+               $notif_tpl = get_markup_template('notifications.tpl');
+               
+               $not_tpl = get_markup_template('notify.tpl');
+               require_once('include/bbcode.php');
+
+               $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
+                       intval(local_user())
+               );
+               
+               if (count($r) > 0) {
+                       foreach ($r as $it) {
+                               $notif_content .= replace_macros($not_tpl,array(
+                                       '$item_link' => $a->get_baseurl().'/notify/view/'. $it['id'],
+                                       '$item_image' => $it['photo'],
+                                       '$item_text' => strip_tags(bbcode($it['msg'])),
+                                       '$item_when' => relative_date($it['date'])
+                               ));
+                       }
+               } else {
+                       $notif_content .= t('No more system notifications.');
+               }
+               
+               $o .= replace_macros($notif_tpl,array(
+                       '$notif_header' => t('System Notifications'),
+                       '$tabs' => '', // $tabs,
+                       '$notif_content' => $notif_content,
+               ));
+
+       return $o;
+
+
 }
\ No newline at end of file

diff --git a/view/notifications.tpl b/view/notifications.tpl
index 487f8b480c24827c2ae638c955dc6e93d9282146..1a13b68b90d5467fb1b8fedd8aea507abdc6c3ed 100755 (executable)
--- a/view/notifications.tpl
+++ b/view/notifications.tpl
@@ -1,5 +1,5 @@
 
-<h1>Notifications</h1>
+<h1>$notif_header</h1>
 
 {{ inc common_tabs.tpl }}{{ endinc }}