From 1859fa947a6fe4ee6fa3b01c942087af2e92dccd Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Mon, 29 Nov 2010 15:27:57 +0000 Subject: [PATCH] Merged BRANCHES/V3.4 to HEAD: 24049: Fix for ALF-5902 & ALF-5905: Italian, Spanish translation errors in Explorer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24054 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/web/ui/repo/component/UINodeWorkflowInfo.java | 5 +---- .../alfresco/web/ui/repo/component/UIWorkflowSummary.java | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/source/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java b/source/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java index 1109456ca4..129bd75a73 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java +++ b/source/java/org/alfresco/web/ui/repo/component/UINodeWorkflowInfo.java @@ -20,7 +20,6 @@ package org.alfresco.web.ui.repo.component; import java.io.IOException; import java.text.MessageFormat; -import java.text.SimpleDateFormat; import java.util.List; import java.util.Map; import java.util.ResourceBundle; @@ -310,8 +309,6 @@ public class UINodeWorkflowInfo extends SelfRenderingComponent node.getNodeRef(), true); if (workflows != null && workflows.size() > 0) { - SimpleDateFormat format = new SimpleDateFormat(bundle.getString("date_pattern")); - // list out all the workflows the document is part of if (isContent) { @@ -337,7 +334,7 @@ public class UINodeWorkflowInfo extends SelfRenderingComponent { out.write(bundle.getString("started_on").toLowerCase()); out.write(" "); - out.write(format.format(wi.startDate)); + out.write(Utils.getDateFormat(context).format(wi.startDate)); out.write(" "); } if (wi.initiator != null) diff --git a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java index 3d0efed996..c8a6babeef 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java +++ b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowSummary.java @@ -19,7 +19,6 @@ package org.alfresco.web.ui.repo.component; import java.io.IOException; -import java.text.SimpleDateFormat; import java.util.ResourceBundle; import javax.faces.context.FacesContext; @@ -83,7 +82,6 @@ public class UIWorkflowSummary extends SelfRenderingComponent { ResponseWriter out = context.getResponseWriter(); ResourceBundle bundle = Application.getBundle(context); - SimpleDateFormat format = new SimpleDateFormat(bundle.getString("date_pattern")); // output surrounding table and style if necessary out.write(""); if (wi.startDate != null) { - out.write(format.format(wi.startDate)); + out.write(Utils.getDateFormat(context).format(wi.startDate)); } out.write(""); out.write(bundle.getString("completed_on")); out.write(":"); if (wi.endDate != null) { - out.write(format.format(wi.endDate)); + out.write(Utils.getDateFormat(context).format(wi.endDate)); } else {