Re: [Tikiwiki-cvs/svn] Daily reports & [r39901] trunk/templates/mail

[Marc L. <ma...@ma...>]

I prefer option 1
On 2012-02-22 4:52 AM, "Xavier de Pedro" <xav...@vh...> wrote:

> Hi Jonny:
> (sending to both lists svn and devel in purpose)
>
> Thanks for this change in r39901.
>
> Regarding the feature "Daily reports", I'm not sure what's the best
> solution. So far (afaik, even if rodrigo might have some refactoring
> plans in his mind/roadmap, maybe?) , mails sent by daily reports have
> this type of format:
>
>     "Yesterday 11:10: UserX added or edited item Foo in tracker Bar"
>
> but the email may be from a few days ago (due to some bug or
> missconfiguration somewhere), for instance.
>
> So I reckon that we should ensure that no confusions are generated, by
> means of replacing the words "today", "yesterday", etc., by the exact
> date (in whatever short format tiki wants to write), or at least adding
> also the date. So which option do you think is the prefered one?
>
> option 1: "20.02.02 11:10: UserX added or edited item Foo in tracker Bar"
>
> or
>
> option 2: "Yesterday (20.02.02) 11:10: UserX added or edited item Foo in
> tracker Bar"
>
> I've noticed that this is coded in function makeTime in line 70 of
> trunk/lib/reportslib.php
>
>     private function makeTime($time) {
>         if (date("d.m.Y", $time)==date("d.m.Y", time()-86400)) {
>             return tr("Yesterday %0", date("H:i", $time));
>         } elseif (date("d.m.Y", $time)==date("d.m.Y", time())) {
>             return tr("Today %0", date("H:i", $time));
>         } else {
>             return date("d.m.", $time)." ".date("H:i", $time);
>         }
>     }
>
>
> If option 2 was chosen, what would be the right syntax for line 72:
>
>             return tr("Yesterday %0 %1", date("d.m.y", $time),
> date("H:i", $time));
>
> Is this right?
>
> Xavi
>
> On 21/02/12 19:50, jon...@us... wrote:
> > Revision: 39901
> >
> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=39901&view=rev
> > Author:   jonnybradley
> > Date:     2012-02-21 18:50:23 +0000 (Tue, 21 Feb 2012)
> > Log Message:
> > -----------
> > [FIX] notifications: Always use date and time for dates in mail
> notifications, even if tiki_same_day_time_only=y
> >
> > Modified Paths:
> > --------------
> >      trunk/templates/mail/forum_post_notification.tpl
> >      trunk/templates/mail/messu_message_notification.tpl
> >      trunk/templates/mail/new_user_notification.tpl
> >      trunk/templates/mail/newsletter_articleclip.tpl
> >      trunk/templates/mail/submission_notification.tpl
> >      trunk/templates/mail/tracker_changed_notification.tpl
> >      trunk/templates/mail/user_joins_group_notification.tpl
> >      trunk/templates/mail/user_watch_article_post.tpl
> >      trunk/templates/mail/user_watch_blog_post.tpl
> >      trunk/templates/mail/user_watch_category_created.tpl
> >      trunk/templates/mail/user_watch_category_removed.tpl
> >      trunk/templates/mail/user_watch_category_updated.tpl
> >      trunk/templates/mail/user_watch_comment.tpl
> >      trunk/templates/mail/user_watch_file_gallery_remove_file.tpl
> >      trunk/templates/mail/user_watch_file_gallery_upload.tpl
> >      trunk/templates/mail/user_watch_image_gallery_upload.tpl
> >      trunk/templates/mail/user_watch_map_changed.tpl
> >      trunk/templates/mail/user_watch_object_entered_category.tpl
> >      trunk/templates/mail/user_watch_object_leaved_category.tpl
> >      trunk/templates/mail/user_watch_wiki_new_attach.tpl
> >      trunk/templates/mail/user_watch_wiki_page_changed.tpl
> >      trunk/templates/mail/user_watch_wiki_page_renamed.tpl
> >
> > Modified: trunk/templates/mail/forum_post_notification.tpl
> > ===================================================================
> > --- trunk/templates/mail/forum_post_notification.tpl  2012-02-21
> 18:19:20 UTC (rev 39900)
> > +++ trunk/templates/mail/forum_post_notification.tpl  2012-02-21
> 18:50:23 UTC (rev 39901)
> > @@ -5,7 +5,7 @@
> >   {tr}Author:{/tr} {if $mail_author}"{$mail_author|username}"
> >   {else}{tr}An anonymous user{/tr}{/if}
> >   {tr}Title:{/tr} {$mail_title}
> > -{tr}Date:{/tr} {$mail_date|tiki_short_datetime}
> > +{tr}Date:{/tr} {$mail_date|tiki_short_datetime:"":"n"}
> >
> {$mail_machine}/tiki-view_forum_thread.php?forumId={$forumId}&comments_parentId={$topicId}{if
> $threadId}#threadId{$threadId}{/if}
> >
> >   {if $mail_contributions}{tr}Contribution:{/tr}
> {$mail_contributions}{/if}
> (...)
>
>
>
> ------------------------------------------------------------------------------
> Virtualization & Cloud Management Using Capacity Planning
> Cloud computing makes use of virtualization - but cloud computing
> also focuses on allowing computing to be delivered as a service.
> http://www.accelacomm.com/jaw/sfnl/114/51521223/
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>