From 2fcbba94105a894fb86e2a11c69db6bd4aec55b1 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Thu, 22 Dec 2016 00:28:52 +0100
Subject: [PATCH] provide local time for notifications

---
 include/NotificationsManager.php              | 33 ++++++++++++-------
 mod/notifications.php                         |  1 +
 view/templates/notifications_attend_item.tpl  |  2 +-
 .../templates/notifications_comments_item.tpl |  2 +-
 .../templates/notifications_dislikes_item.tpl |  2 +-
 view/templates/notifications_friends_item.tpl |  2 +-
 view/templates/notifications_likes_item.tpl   |  2 +-
 view/templates/notifications_network_item.tpl |  2 +-
 view/templates/notifications_posts_item.tpl   |  2 +-
 view/templates/notify.tpl                     |  2 +-
 view/theme/frio/templates/notify.tpl          |  2 +-
 11 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php
index 610acb93d..611860f9d 100644
--- a/include/NotificationsManager.php
+++ b/include/NotificationsManager.php
@@ -198,9 +198,10 @@ class NotificationsManager {
 	 *	string 'label' => The type of the notification
 	 *	string 'link' => URL to the source
 	 *	string 'image' => The avatar image
-	 * *	string 'url' => The profile url of the contact
+	 *	string 'url' => The profile url of the contact
 	 *	string 'text' => The notification text
-	 *	string 'when' => Relative date of the notification
+	 *	string 'when' => The date of the notification
+	 *	string 'ago' => T relative date of the notification
 	 *	bool 'seen' => Is the notification marked as "seen"
 	 */
 	private function formatNotifs($notifs, $ident = "") {
@@ -226,7 +227,8 @@ class NotificationsManager {
 						$default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
 						$default_item_url = $it['url'];
 						$default_item_text = strip_tags(bbcode($it['msg']));
-						$default_item_when = relative_date($it['date']);
+						$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['date'], 'r');
+						$default_item_ago = relative_date($it['date']);
 						break;
 
 					case 'home':
@@ -235,7 +237,8 @@ class NotificationsManager {
 						$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
 						$default_item_url = $it['author-link'];
 						$default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']);
-						$default_item_when = relative_date($it['created']);
+						$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
+						$default_item_ago = relative_date($it['created']);
 						break;
 
 					default:
@@ -246,7 +249,8 @@ class NotificationsManager {
 						$default_item_text = (($it['id'] == $it['parent'])
 									? sprintf(t("%s created a new post"), $it['author-name'])
 									: sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']));
-						$default_item_when = relative_date($it['created']);
+						$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
+						$default_item_ago = relative_date($it['created']);
 
 				}
 
@@ -259,7 +263,8 @@ class NotificationsManager {
 							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
 							'url' => $it['author-link'],
 							'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']),
-							'when' => relative_date($it['created']),
+							'when' => $default_item_when,
+							'ago' => $default_item_ago,
 							'seen' => $it['seen']
 						);
 						break;
@@ -271,7 +276,8 @@ class NotificationsManager {
 							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
 							'url' => $it['author-link'],
 							'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']),
-							'when' => relative_date($it['created']),
+							'when' => $default_item_when,
+							'ago' => $default_item_ago,
 							'seen' => $it['seen']
 						);
 						break;
@@ -283,7 +289,8 @@ class NotificationsManager {
 							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
 							'url' => $it['author-link'],
 							'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']),
-							'when' => relative_date($it['created']),
+							'when' => $default_item_when,
+							'ago' => $default_item_ago,
 							'seen' => $it['seen']
 						);
 						break;
@@ -295,7 +302,8 @@ class NotificationsManager {
 							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
 							'url' => $it['author-link'],
 							'text' => sprintf( t("%s is not attending %s's event"), $it['author-name'], $it['pname']),
-							'when' => relative_date($it['created']),
+							'when' => $default_item_when,
+							'ago' => $default_item_ago,
 							'seen' => $it['seen']
 						);
 						break;
@@ -307,7 +315,8 @@ class NotificationsManager {
 							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
 							'url' => $it['author-link'],
 							'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']),
-							'when' => relative_date($it['created']),
+							'when' => $default_item_when,
+							'ago' => $default_item_ago,
 							'seen' => $it['seen']
 						);
 						break;
@@ -323,7 +332,8 @@ class NotificationsManager {
 							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
 							'url' => $it['author-link'],
 							'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']),
-							'when' => relative_date($it['created']),
+							'when' => $default_item_when,
+							'ago' => $default_item_ago,
 							'seen' => $it['seen']
 						);
 						break;
@@ -336,6 +346,7 @@ class NotificationsManager {
 							'url' => $default_item_url,
 							'text' => $default_item_text,
 							'when' => $default_item_when,
+							'ago' => $default_item_ago,
 							'seen' => $it['seen']
 						);
 				}
diff --git a/mod/notifications.php b/mod/notifications.php
index 97c009b19..78b26b5d6 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -288,6 +288,7 @@ function notifications_content(&$a) {
 				'$item_url' => $it['url'],
 				'$item_text' => htmlentities($it['text']),
 				'$item_when' => $it['when'],
+				'$item_ago' => $it['ago'],
 				'$item_seen' => $it['seen'],
 			));
 		}
diff --git a/view/templates/notifications_attend_item.tpl b/view/templates/notifications_attend_item.tpl
index 6add369cb..adaa539d1 100644
--- a/view/templates/notifications_attend_item.tpl
+++ b/view/templates/notifications_attend_item.tpl
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-	<a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+	<a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/templates/notifications_comments_item.tpl b/view/templates/notifications_comments_item.tpl
index dfa15df28..255080671 100644
--- a/view/templates/notifications_comments_item.tpl
+++ b/view/templates/notifications_comments_item.tpl
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/templates/notifications_dislikes_item.tpl b/view/templates/notifications_dislikes_item.tpl
index dfa15df28..255080671 100644
--- a/view/templates/notifications_dislikes_item.tpl
+++ b/view/templates/notifications_dislikes_item.tpl
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/templates/notifications_friends_item.tpl b/view/templates/notifications_friends_item.tpl
index dfa15df28..255080671 100644
--- a/view/templates/notifications_friends_item.tpl
+++ b/view/templates/notifications_friends_item.tpl
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/templates/notifications_likes_item.tpl b/view/templates/notifications_likes_item.tpl
index 6add369cb..adaa539d1 100644
--- a/view/templates/notifications_likes_item.tpl
+++ b/view/templates/notifications_likes_item.tpl
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-	<a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+	<a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/templates/notifications_network_item.tpl b/view/templates/notifications_network_item.tpl
index 64395a83d..a50b2cf2a 100644
--- a/view/templates/notifications_network_item.tpl
+++ b/view/templates/notifications_network_item.tpl
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
diff --git a/view/templates/notifications_posts_item.tpl b/view/templates/notifications_posts_item.tpl
index dfa15df28..255080671 100644
--- a/view/templates/notifications_posts_item.tpl
+++ b/view/templates/notifications_posts_item.tpl
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/templates/notify.tpl b/view/templates/notify.tpl
index dfa15df28..255080671 100644
--- a/view/templates/notify.tpl
+++ b/view/templates/notify.tpl
@@ -1,4 +1,4 @@
 
 <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
+	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a>
 </div>
\ No newline at end of file
diff --git a/view/theme/frio/templates/notify.tpl b/view/theme/frio/templates/notify.tpl
index 86633bbec..6122ecdfb 100644
--- a/view/theme/frio/templates/notify.tpl
+++ b/view/theme/frio/templates/notify.tpl
@@ -6,7 +6,7 @@
 	<div class="notif-desc-wrapper media-body">
 		<a href="{{$item_link}}">
 			{{$item_text}}
-			<div><time class="notif-when time" data-toggle="tooltip">{{$item_when}}</time></div>
+			<div><time class="notif-when time" data-toggle="tooltip" title="{{$item_when}}">{{$item_ago}}</time></div>
 		</a>
 	</div>
 </div>