From 3daff3fc56ecf15b9c530260dce8460cad3f38ed Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Fri, 1 Jun 2012 16:57:13 +0000 Subject: [PATCH] ALF-14316 - Odin - Date not formatted for some non-english locales - Commited code has been reverted, becauces it caused another error (update of a blog post was not possible) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../webscripts/org/alfresco/repository/blogs/blogpost.lib.ftl | 2 +- .../java/org/alfresco/repo/web/scripts/blogs/BlogPostLibJs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.ftl index 5b0367e3eb..40289f26b3 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/blogs/blogpost.lib.ftl @@ -59,7 +59,7 @@ <#-- draft vs internal published --> "isDraft": ${item.isDraft?string}, <#if (! item.isDraft)> - "releasedOn": "${item.releasedDate?c}", + "releasedOn": "${item.releasedDate?string("MMM dd yyyy HH:mm:ss 'GMT'Z '('zzz')'")}", <#-- true if the post has been updated --> "isUpdated": ${item.isUpdated?string}, diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/BlogPostLibJs.java b/source/java/org/alfresco/repo/web/scripts/blogs/BlogPostLibJs.java index 81a0a7175a..9e5d72494a 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/BlogPostLibJs.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/BlogPostLibJs.java @@ -76,7 +76,7 @@ public class BlogPostLibJs boolean isPublished = published != null; if (isPublished) { - data.put("releasedDate", ((Date)published).getTime()); + data.put("releasedDate", published); } // draft