5300 dateformat

src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java

@@ -6,23 +6,16 @@
 import edu.harvard.iq.dataverse.util.FileUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
+import edu.harvard.iq.dataverse.util.DateUtil;
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import edu.harvard.iq.dataverse.workflows.WorkflowComment;
 import java.io.Serializable;
 import java.net.URL;
+import java.sql.Timestamp;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Set;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -300,7 +293,7 @@ public String getVersionDate() {
         if (this.lastUpdateTime == null){
             return null; 
         }
-        return new SimpleDateFormat("MMMM d, yyyy").format(lastUpdateTime);
+        return DateUtil.formatDate(lastUpdateTime);
     }
 
     public String getVersionYear() {
@@ -1798,4 +1791,8 @@ public String getJsonLd() {
         return jsonLd;
     }
 
+    public String getLocaleLastUpdateTime() {
+        return DateUtil.formatDate(new Timestamp(lastUpdateTime.getTime()));
+    }
+
 }

src/main/java/edu/harvard/iq/dataverse/FileMetadata.java

@@ -7,7 +7,6 @@
 import com.google.gson.annotations.Expose;
 import java.io.Serializable;
 import java.sql.Timestamp;
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -32,9 +31,10 @@
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.Version;
+
+import edu.harvard.iq.dataverse.util.DateUtil;
 import org.hibernate.validator.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
-import org.apache.commons.lang.StringEscapeUtils;
 
 
 /**
@@ -45,7 +45,6 @@
 @Entity
 public class FileMetadata implements Serializable {
     private static final long serialVersionUID = 1L;
-    private static final DateFormat displayDateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM);    
     private static final Logger logger = Logger.getLogger(FileMetadata.class.getCanonicalName());
 
 
@@ -319,7 +318,7 @@ public String getFileDateToDisplay() {
             }
         }
         if (fileDate != null) {
-            return displayDateFormat.format(fileDate);
+            return DateUtil.formatDate(fileDate);
         }
         return "";
     }

src/main/java/edu/harvard/iq/dataverse/Guestbook.java

@@ -21,6 +21,8 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
+
+import edu.harvard.iq.dataverse.util.DateUtil;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.hibernate.validator.constraints.NotBlank;
 
@@ -145,7 +147,7 @@ public void setCreateTime(Date createTime) {
     }
 
     public String getCreateDate() {
-        return new SimpleDateFormat("MMMM d, yyyy").format(createTime);
+        return DateUtil.formatDate(createTime);
     }
 
     public Guestbook copyGuestbook(Guestbook source, Dataverse dataverse) {

src/main/java/edu/harvard/iq/dataverse/UserNotification.java

@@ -1,6 +1,8 @@
 package edu.harvard.iq.dataverse;
 
 import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser;
+import edu.harvard.iq.dataverse.util.DateUtil;
+
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
@@ -147,4 +149,8 @@ public String getRoleString() {
     public void setRoleString(String roleString) {
         this.roleString = roleString;
     }
+
+    public String getLocaleSendDate() {
+        return DateUtil.formatDate(sendDate);
+    }
 }

src/main/java/edu/harvard/iq/dataverse/search/SolrSearchResult.java

@@ -5,6 +5,7 @@
 import edu.harvard.iq.dataverse.DvObject;
 import edu.harvard.iq.dataverse.api.Util;
 import edu.harvard.iq.dataverse.dataset.DatasetThumbnail;
+import edu.harvard.iq.dataverse.util.DateUtil;
 import edu.harvard.iq.dataverse.util.json.JsonPrinter;
 import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import java.util.ArrayList;
@@ -885,7 +886,7 @@ public void setReleaseOrCreateDate(Date releaseOrCreateDate) {
     }
 
     public String getDateToDisplayOnCard() {
-        return dateToDisplayOnCard;
+        return DateUtil.formatDate(dateToDisplayOnCard,"MMM dd, yyyy");
     }
 
     public void setDateToDisplayOnCard(String dateToDisplayOnCard) {

src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java

@@ -0,0 +1,65 @@
+package edu.harvard.iq.dataverse.util;
+
+import edu.harvard.iq.dataverse.DataverseLocaleBean;
+
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+/**
+ *
+ * @author jchengan
+ */
+public class DateUtil {
+
+    public static String formatDate(Date dateToformat) {
+        String formattedDate;
+        DateFormat dateFormatter;
+        try {
+            DataverseLocaleBean d = new DataverseLocaleBean();
+            Locale currentLocale = new Locale(d.getLocaleCode());
+            dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, currentLocale);
+            formattedDate = dateFormatter.format(dateToformat);
+            return formattedDate;
+        } catch(Exception e) {
+            return null;
+        }
+    }
+
+    public static String formatDate(String dateToformat, String format) {
+        String formattedDate = "";
+        DateFormat inputFormat = new SimpleDateFormat(format);
+        Date _date = null;
+        try {
+            _date = inputFormat.parse(dateToformat);
+            formattedDate = formatDate(_date);
+            return formattedDate;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public static String formatDate(Timestamp datetimeToformat) {
+        String formattedDate;
+        DateFormat dateFormatter;
+        try {
+             DataverseLocaleBean d = new DataverseLocaleBean();
+             Locale currentLocale = new Locale(d.getLocaleCode());
+             dateFormatter = DateFormat.getDateTimeInstance(
+                                                     DateFormat.DEFAULT,
+                                                     DateFormat.LONG,
+                                                     currentLocale);
+             formattedDate = dateFormatter.format(datetimeToformat);
+
+             return formattedDate;
+         } catch (Exception e) {
+             e.printStackTrace();
+             return null;
+         }
+    }
+}

src/main/webapp/dataset.xhtml

@@ -10,6 +10,7 @@
       xmlns:cc="http://java.sun.com/jsf/composite"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
+
     <h:head>
     </h:head>
     <h:body>
@@ -853,11 +854,11 @@
                             </div>
                             <div class="pull-left">
                                 #{bundle['file.viewDiffDialog.version']}: #{DatasetPage.datasetVersionDifference.originalVersion.semanticVersion}<br/>
-                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.originalVersion.lastUpdateTime}
+                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.originalVersion.localeLastUpdateTime}
                             </div>
                             <div class="pull-left">
                                 #{bundle['file.viewDiffDialog.version']}: #{DatasetPage.datasetVersionDifference.newVersion.semanticVersion}<br/>
-                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.newVersion.lastUpdateTime}
+                                #{bundle['file.viewDiffDialog.lastUpdated']}: #{DatasetPage.datasetVersionDifference.newVersion.localeLastUpdateTime}
                             </div>
                         </div>
                         <ui:fragment rendered="#{!empty(DatasetPage.datasetVersionDifference.detailDataByBlock)}">
@@ -1600,4 +1601,5 @@
             </ui:define>
         </ui:composition>
     </h:body>
+
 </html>

src/main/webapp/dataverseuser.xhtml

@@ -316,7 +316,7 @@
                                                     </h:outputFormat>
                                                 </ui:fragment>
                                             </ui:fragment>
-                                            <h:outputText value="#{item.sendDate}" styleClass="text-muted small"/>
+                                            <h:outputText value="#{item.localeSendDate}" styleClass="text-muted small"/>
                                         </div>
                                         <div class="notification-item-cell">
                                             <p:commandLink title="#{bundle.removeNotification}" styleClass="bootstrap-button-tooltip"