mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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
This commit is contained in:
@@ -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)
|
||||
|
@@ -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("<table");
|
||||
@@ -135,14 +133,14 @@ public class UIWorkflowSummary extends SelfRenderingComponent
|
||||
out.write(":</td><td>");
|
||||
if (wi.startDate != null)
|
||||
{
|
||||
out.write(format.format(wi.startDate));
|
||||
out.write(Utils.getDateFormat(context).format(wi.startDate));
|
||||
}
|
||||
out.write("</td></tr><tr><td>");
|
||||
out.write(bundle.getString("completed_on"));
|
||||
out.write(":</td><td>");
|
||||
if (wi.endDate != null)
|
||||
{
|
||||
out.write(format.format(wi.endDate));
|
||||
out.write(Utils.getDateFormat(context).format(wi.endDate));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user