diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_html.xml b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_html.xml index 17c5e9386dc979946851357841acdb766f13c7db..b281d7ad99ad6061080f23dd28eb42ed7f46de0e 100644 --- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_html.xml +++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_html.xml @@ -252,7 +252,7 @@ </tuple> <state> <tuple> - <float>1538885951.97</float> + <float>1538971816.32</float> <string>GMT+9</string> </tuple> </state> diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.js b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.js index dc07b16608e4c736a585a9859393d0c85c2513d7..d45b4b4615ad30d78b2824ab922e2a99d83ee89d 100644 --- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.js +++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.js @@ -1,6 +1,6 @@ -/*global window, rJS, RSVP, calculatePageTitle, FormData, URI, jIO*/ +/*global window, rJS, RSVP, calculatePageTitle, FormData, URI, jIO, moment */ /*jslint nomen: true, indent: 2, maxerr: 3 */ -(function (window, rJS, RSVP, calculatePageTitle) { +(function (window, rJS, RSVP, calculatePageTitle, moment) { "use strict"; rJS(window) @@ -152,6 +152,16 @@ page_title: all_result[7] }); }) + .push(function () { + // set locale for momentjs + return gadget.jio_getAttachment( + 'post_module', + gadget.hateoas_url + "/Localizer/get_selected_language", + {format:'text'} + ).push(function(lang){ + moment.locale(lang); + }) + }) .push(function () { return gadget.jio_getAttachment( 'post_module', @@ -181,7 +191,7 @@ for (i = 0; i < post_list.length; i += 1) { s += '<li>' + 'By <strong>' + post_list[i][0] + '</strong>' + - ' - <time>' + post_list[i][1] + '</time><br/>'; + ' - <time datetime="' + post_list[i][1] + '" title="' + moment(post_list[i][1]).format('LLLL') + '">' + moment(post_list[i][1]).fromNow() + '</time><br/>'; if (post_list[i][3] !== null && result_list[i] !== null) { post_list[i][3] = result_list[i]; } @@ -269,4 +279,4 @@ .onEvent('submit', function () { this.submitPostComment(); }); -}(window, rJS, RSVP, calculatePageTitle)); \ No newline at end of file +}(window, rJS, RSVP, calculatePageTitle, moment)); \ No newline at end of file diff --git a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.xml b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.xml index fcab72ef9f5170d80ffc2724981207462155411d..38f89e8728cbf95166d813eeba8bfa31a765dc4e 100644 --- a/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.xml +++ b/bt5/erp5_officejs_support_request_ui/PathTemplateItem/web_page_module/gadget_supportrequest_pt_form_view_discussable_js.xml @@ -252,7 +252,7 @@ </tuple> <state> <tuple> - <float>1538886067.22</float> + <float>1538972059.78</float> <string>GMT+9</string> </tuple> </state> diff --git a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.py b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.py index 47674efc64b8a706e4833e3414be01abab3016aa..049a75d15583d068ef6789be2ad9d2ef56c1231f 100644 --- a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.py +++ b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.py @@ -53,7 +53,7 @@ if successor_list: portal.portal_sessions[ '%s.latest_comment' % follow_up_value.getRelativeUrl()]['comment_post_list'] = ( post.Base_getOwnerTitle(), - post.getStartDate().rfc822(), + post.getStartDate().ISO8601(), post.asStrippedHTML(), successor_link, successor_name, diff --git a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequest_getCommentPostListAsJson.py b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequest_getCommentPostListAsJson.py index 97e6d75f59f281cda465d3691082cc2156d13fb4..c3401cc3b4f83b729162a1d5901b56d90d1b9d28 100644 --- a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequest_getCommentPostListAsJson.py +++ b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequest_getCommentPostListAsJson.py @@ -23,7 +23,7 @@ for event in event_list: comment_list.append(( event.getSourceTitle(), - event.getStartDate().rfc822(), + event.getStartDate().ISO8601(), event.asStrippedHTML(), attachment_link, attachment_name,