friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

provide local time for notifications

This commit is contained in:
rabuzarus 2016-12-22 00:28:52 +01:00
parent 125d2f24dd
commit 2fcbba9410
11 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/NotificationsManager.php
View File

@ -198,9 +198,10 @@ class NotificationsManager {
* string 'label' => The type of the notification * string 'label' => The type of the notification
* string 'link' => URL to the source * string 'link' => URL to the source
* string 'image' => The avatar image * 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 '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" * bool 'seen' => Is the notification marked as "seen"
*/ */
private function formatNotifs($notifs, $ident = "") { private function formatNotifs($notifs, $ident = "") {
@ -226,7 +227,8 @@ class NotificationsManager {
$default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO); $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
$default_item_url = $it['url']; $default_item_url = $it['url'];
$default_item_text = strip_tags(bbcode($it['msg'])); $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; break;
case 'home': case 'home':
@ -235,7 +237,8 @@ class NotificationsManager {
$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO); $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
$default_item_url = $it['author-link']; $default_item_url = $it['author-link'];
$default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']); $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; break;
default: default:
@ -246,7 +249,8 @@ class NotificationsManager {
$default_item_text = (($it['id'] == $it['parent']) $default_item_text = (($it['id'] == $it['parent'])
? sprintf(t("%s created a new post"), $it['author-name']) ? sprintf(t("%s created a new post"), $it['author-name'])
: sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname'])); : 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), 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
'url' => $it['author-link'], 'url' => $it['author-link'],
'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']), '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'] 'seen' => $it['seen']
); );
break; break;
@ -271,7 +276,8 @@ class NotificationsManager {
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
'url' => $it['author-link'], 'url' => $it['author-link'],
'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']), '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'] 'seen' => $it['seen']
); );
break; break;
@ -283,7 +289,8 @@ class NotificationsManager {
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
'url' => $it['author-link'], 'url' => $it['author-link'],
'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']), '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'] 'seen' => $it['seen']
); );
break; break;
@ -295,7 +302,8 @@ class NotificationsManager {
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
'url' => $it['author-link'], 'url' => $it['author-link'],
'text' => sprintf( t("%s is not attending %s's event"), $it['author-name'], $it['pname']), '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'] 'seen' => $it['seen']
); );
break; break;
@ -307,7 +315,8 @@ class NotificationsManager {
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
'url' => $it['author-link'], 'url' => $it['author-link'],
'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']), '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'] 'seen' => $it['seen']
); );
break; break;
@ -323,7 +332,8 @@ class NotificationsManager {
'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO), 'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
'url' => $it['author-link'], 'url' => $it['author-link'],
'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']), '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'] 'seen' => $it['seen']
); );
break; break;
@ -336,6 +346,7 @@ class NotificationsManager {
'url' => $default_item_url, 'url' => $default_item_url,
'text' => $default_item_text, 'text' => $default_item_text,
'when' => $default_item_when, 'when' => $default_item_when,
'ago' => $default_item_ago,
'seen' => $it['seen'] 'seen' => $it['seen']
); );
} }

1
mod/notifications.php
View File

@ -288,6 +288,7 @@ function notifications_content(&$a) {
'$item_url' => $it['url'], '$item_url' => $it['url'],
'$item_text' => htmlentities($it['text']), '$item_text' => htmlentities($it['text']),
'$item_when' => $it['when'], '$item_when' => $it['when'],
'$item_ago' => $it['ago'],
'$item_seen' => $it['seen'], '$item_seen' => $it['seen'],
)); ));
} }

2
view/templates/notifications_attend_item.tpl
View File

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <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> </div>

2
view/templates/notifications_comments_item.tpl
View File

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <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> </div>

2
view/templates/notifications_dislikes_item.tpl
View File

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <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> </div>

2
view/templates/notifications_friends_item.tpl
View File

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <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> </div>

2
view/templates/notifications_likes_item.tpl
View File

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <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> </div>

2
view/templates/notifications_network_item.tpl
View File

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <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> </div>

2
view/templates/notifications_posts_item.tpl
View File

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <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> </div>

2
view/templates/notify.tpl
View File

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <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> </div>

2
view/theme/frio/templates/notify.tpl
View File

@ -6,7 +6,7 @@
<div class="notif-desc-wrapper media-body"> <div class="notif-desc-wrapper media-body">
<a href="{{$item_link}}"> <a href="{{$item_link}}">
{{$item_text}} {{$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> </a>
</div> </div>
</div> </div>