From 71a13e30a771f22abc5805586bb88651c1b2f9aa Mon Sep 17 00:00:00 2001
From: Juan Corrales <juancorr@gmail.com>
Date: Fri, 1 Mar 2019 13:08:16 +0100
Subject: [PATCH 1/6] Pruebas de formateo para buscar error en la fecha en la
 v4.9.11

---
 .../edu/harvard/iq/dataverse/util/DateUtil.java  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
index ffde59d6ce5..d108439de41 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
@@ -7,6 +7,8 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
@@ -14,6 +16,8 @@
  */
 public class DateUtil {
 
+    private static final Logger logger = Logger.getLogger(DateUtil.class.getCanonicalName());
+
     public static String formatDate(Date dateToformat) {
         String formattedDate;
         DateFormat dateFormatter;
@@ -21,6 +25,9 @@ public static String formatDate(Date dateToformat) {
             Locale currentLocale = BundleUtil.getCurrentLocale();
             dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, currentLocale);
             formattedDate = dateFormatter.format(dateToformat);
+            logger.log(Level.SEVERE, "******** JUAN ******: Fecha Formateada en formatDate: {0}", formattedDate);
+            logger.log(Level.SEVERE, "******** JUAN ******: Locale en formatDate: {0}", currentLocale.getDisplayName());
+
             return formattedDate;
         } catch(Exception e) {
             return null;
@@ -28,10 +35,19 @@ public static String formatDate(Date dateToformat) {
     }
 
     public static String formatDate(String dateToformat, String format) {
+
+        
+        
         String formattedDate = "";
         DateFormat inputFormat = new SimpleDateFormat(format);
         Date _date = null;
+        logger.log(Level.SEVERE, "******** JUAN ******: Fecha A formatear en formatDate instancia 2: {0}", dateToformat);
+        logger.log(Level.SEVERE, "******** JUAN ******: Formato en formatDate instancia 2: {0}", format);
         try {
+            Locale currentLocale = BundleUtil.getCurrentLocale();
+            DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, currentLocale);
+            
+            
             _date = inputFormat.parse(dateToformat);
             formattedDate = formatDate(_date);
             return formattedDate;

From 7e4a84c0004d07b6de15653d36349938c0ffde4c Mon Sep 17 00:00:00 2001
From: Juan Corrales <juancorr@gmail.com>
Date: Thu, 7 Mar 2019 13:57:53 +0100
Subject: [PATCH 2/6] Inital commit to search translated facet failures

---
 .../iq/dataverse/DatasetFieldType.java        | 13 +++++++++-
 .../iq/dataverse/DataverseHeaderFragment.java |  2 +-
 .../dataverse/search/SearchServiceBean.java   |  7 ++++++
 .../harvard/iq/dataverse/util/DateUtil.java   | 24 +++++++++----------
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
index 04901264455..e42e6c24eed 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
@@ -12,6 +12,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.MissingResourceException;
+import java.util.logging.Logger;
 import javax.faces.model.SelectItem;
 import javax.persistence.*;
 
@@ -30,6 +31,9 @@
 @Entity
 @Table(indexes = {@Index(columnList="metadatablock_id"),@Index(columnList="parentdatasetfieldtype_id")})
 public class DatasetFieldType implements Serializable, Comparable<DatasetFieldType> {
+    
+        private static final Logger logger = Logger.getLogger(DatasetFieldType.class.getCanonicalName());
+
 
     /**
      * The set of possible metatypes of the field. Used for validation and layout.
@@ -510,8 +514,11 @@ public int compareTo(DatasetFieldType o) {
     
     public String getDisplayName() {
         if (isHasParent() && !parentDatasetFieldType.getTitle().equals(title)) {
-        return parentDatasetFieldType.getLocaleTitle()  + " " + getLocaleTitle();
+            logger.info (" AAAAAA JUAN getDisplayName isHasParent " + title);
+
+            return parentDatasetFieldType.getLocaleTitle()  + " " + getLocaleTitle();
         } else {
+            logger.info (" AAAAAA JUAN getDisplayName not isHasParent " + title);
             return getLocaleTitle();
         }
     }
@@ -561,12 +568,16 @@ public SolrField getSolrField() {
 
     public String getLocaleTitle() {
         if(getMetadataBlock()  == null) {
+            logger.info (" AAAAAA JUAN 1 " + title);
             return title;
         }
         else {
             try {
+                logger.info (" AAAAAA JUAN 2 " + "datasetfieldtype." + getName() + ".title" + "     " + getMetadataBlock().getName() + "   " + 
+                        BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".title", getMetadataBlock().getName()));
                 return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".title", getMetadataBlock().getName());
             } catch (MissingResourceException e) {
+            logger.info (" AAAAAA JUAN 3 " + title);
                 return title;
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
index 0085c395f1e..26944a0460d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 package edu.harvard.iq.dataverse;
-
+ 
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
index 77a5e3ef563..ebb69e7f227 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
@@ -647,14 +647,18 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
              * the todo above but we need a way to lookup by Solr field, so
              * we'll build a hashmap
              */
+            logger.info("BBBBBBBBBB JUAN 1" + facetCategory.getFriendlyName() + " " + facetCategory.getName());
             for (DatasetFieldType datasetField : datasetFields) {
                 String solrFieldNameForDataset = datasetField.getSolrField().getNameFacetable();
                 String friendlyName = datasetField.getDisplayName();
                 if (solrFieldNameForDataset != null && facetField.getName().endsWith(datasetField.getTmpNullFieldTypeIdentifier())) {
+                    logger.info("BBBBBBBBBB JUAN 2.1");
                     // give it the non-friendly name so we remember to update the reference data script for datasets
                     facetCategory.setName(facetField.getName());
                 } else if (solrFieldNameForDataset != null && facetField.getName().equals(solrFieldNameForDataset)) {
+                    logger.info("BBBBBBBBBB JUAN 2.2");
                     if (friendlyName != null && !friendlyName.isEmpty()) {
+                        logger.info("BBBBBBBBBB JUAN 2.3");
                         facetCategory.setFriendlyName(friendlyName);
                         // stop examining available dataset fields. we found a match
                         break;
@@ -662,6 +666,7 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
                 }
                 datasetfieldFriendlyNamesBySolrField.put(datasetField.getSolrField().getNameFacetable(), friendlyName);
             }
+            logger.info("BBBBBBBBBB JUAN 3" + facetCategory.getFriendlyName() + " " + facetCategory.getName());
             /**
              * @todo get rid of this crazy reflection, per todo above... or
              * should we... let's put into a hash the friendly names of facet
@@ -733,6 +738,8 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
             }
             facetCategory.setName(rangeFacet.getName());
             facetCategory.setFacetLabel(facetLabelList);
+            logger.info("BBBBBBBBBB JUAN " + facetCategory.getFriendlyName() + " " + facetCategory.getName());
+
             // reverse to show the newest citation year range at the top
             List<FacetLabel> facetLabelListReversed = new ArrayList<>();
             ListIterator<FacetLabel> li = facetLabelList.listIterator(facetLabelList.size());
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
index d108439de41..83405dd267d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
@@ -25,8 +25,6 @@ public static String formatDate(Date dateToformat) {
             Locale currentLocale = BundleUtil.getCurrentLocale();
             dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, currentLocale);
             formattedDate = dateFormatter.format(dateToformat);
-            logger.log(Level.SEVERE, "******** JUAN ******: Fecha Formateada en formatDate: {0}", formattedDate);
-            logger.log(Level.SEVERE, "******** JUAN ******: Locale en formatDate: {0}", currentLocale.getDisplayName());
 
             return formattedDate;
         } catch(Exception e) {
@@ -35,25 +33,25 @@ public static String formatDate(Date dateToformat) {
     }
 
     public static String formatDate(String dateToformat, String format) {
-
-        
-        
         String formattedDate = "";
         DateFormat inputFormat = new SimpleDateFormat(format);
         Date _date = null;
-        logger.log(Level.SEVERE, "******** JUAN ******: Fecha A formatear en formatDate instancia 2: {0}", dateToformat);
-        logger.log(Level.SEVERE, "******** JUAN ******: Formato en formatDate instancia 2: {0}", format);
+        logger.log(Level.INFO, "******** DATE ******: Date from solr11: {0}", dateToformat);
         try {
-            Locale currentLocale = BundleUtil.getCurrentLocale();
-            DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, currentLocale);
-            
-            
             _date = inputFormat.parse(dateToformat);
             formattedDate = formatDate(_date);
             return formattedDate;
         } catch (ParseException e) {
-            e.printStackTrace();
-            return null;
+            try {
+                format="dd-MMM-yyyy";
+                inputFormat = new SimpleDateFormat(format);
+                _date = inputFormat.parse(dateToformat);
+                formattedDate = formatDate(_date);
+                return formattedDate;
+            } catch (ParseException ex) {
+                ex.printStackTrace();
+                return null;
+            }
         }
     }
 

From fa2d5d7e794e92e7deb35207bff6e1f5206e3d56 Mon Sep 17 00:00:00 2001
From: Juan Corrales <juancorr@gmail.com>
Date: Tue, 12 Mar 2019 15:48:10 +0100
Subject: [PATCH 3/6] 5623 Facets translation issue

---
 .../iq/dataverse/DatasetFieldType.java        | 15 +++------------
 .../iq/dataverse/DataverseHeaderFragment.java |  2 +-
 .../dataverse/search/SearchServiceBean.java   | 19 +++++++++++--------
 .../harvard/iq/dataverse/util/DateUtil.java   | 18 ++----------------
 4 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
index e42e6c24eed..cd3bea77ae9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
@@ -12,7 +12,6 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.MissingResourceException;
-import java.util.logging.Logger;
 import javax.faces.model.SelectItem;
 import javax.persistence.*;
 
@@ -31,9 +30,6 @@
 @Entity
 @Table(indexes = {@Index(columnList="metadatablock_id"),@Index(columnList="parentdatasetfieldtype_id")})
 public class DatasetFieldType implements Serializable, Comparable<DatasetFieldType> {
-    
-        private static final Logger logger = Logger.getLogger(DatasetFieldType.class.getCanonicalName());
-
 
     /**
      * The set of possible metatypes of the field. Used for validation and layout.
@@ -514,11 +510,10 @@ public int compareTo(DatasetFieldType o) {
     
     public String getDisplayName() {
         if (isHasParent() && !parentDatasetFieldType.getTitle().equals(title)) {
-            logger.info (" AAAAAA JUAN getDisplayName isHasParent " + title);
-
-            return parentDatasetFieldType.getLocaleTitle()  + " " + getLocaleTitle();
+        return parentDatasetFieldType.getLocaleTitle() + ": " + getLocaleTitle(); 
+        // The ": " is a solution to correct French and Spanish translation. Another solution is return only the parent title:
+        // return parentDatasetFieldType.getLocaleTitle();
         } else {
-            logger.info (" AAAAAA JUAN getDisplayName not isHasParent " + title);
             return getLocaleTitle();
         }
     }
@@ -568,16 +563,12 @@ public SolrField getSolrField() {
 
     public String getLocaleTitle() {
         if(getMetadataBlock()  == null) {
-            logger.info (" AAAAAA JUAN 1 " + title);
             return title;
         }
         else {
             try {
-                logger.info (" AAAAAA JUAN 2 " + "datasetfieldtype." + getName() + ".title" + "     " + getMetadataBlock().getName() + "   " + 
-                        BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".title", getMetadataBlock().getName()));
                 return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".title", getMetadataBlock().getName());
             } catch (MissingResourceException e) {
-            logger.info (" AAAAAA JUAN 3 " + title);
                 return title;
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
index 26944a0460d..0085c395f1e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 package edu.harvard.iq.dataverse;
- 
+
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
index ebb69e7f227..bde32705280 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.MissingResourceException;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -647,18 +648,14 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
              * the todo above but we need a way to lookup by Solr field, so
              * we'll build a hashmap
              */
-            logger.info("BBBBBBBBBB JUAN 1" + facetCategory.getFriendlyName() + " " + facetCategory.getName());
             for (DatasetFieldType datasetField : datasetFields) {
                 String solrFieldNameForDataset = datasetField.getSolrField().getNameFacetable();
                 String friendlyName = datasetField.getDisplayName();
                 if (solrFieldNameForDataset != null && facetField.getName().endsWith(datasetField.getTmpNullFieldTypeIdentifier())) {
-                    logger.info("BBBBBBBBBB JUAN 2.1");
                     // give it the non-friendly name so we remember to update the reference data script for datasets
                     facetCategory.setName(facetField.getName());
                 } else if (solrFieldNameForDataset != null && facetField.getName().equals(solrFieldNameForDataset)) {
-                    logger.info("BBBBBBBBBB JUAN 2.2");
                     if (friendlyName != null && !friendlyName.isEmpty()) {
-                        logger.info("BBBBBBBBBB JUAN 2.3");
                         facetCategory.setFriendlyName(friendlyName);
                         // stop examining available dataset fields. we found a match
                         break;
@@ -666,7 +663,6 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
                 }
                 datasetfieldFriendlyNamesBySolrField.put(datasetField.getSolrField().getNameFacetable(), friendlyName);
             }
-            logger.info("BBBBBBBBBB JUAN 3" + facetCategory.getFriendlyName() + " " + facetCategory.getName());
             /**
              * @todo get rid of this crazy reflection, per todo above... or
              * should we... let's put into a hash the friendly names of facet
@@ -687,7 +683,8 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
                         stringBuilder.append(getCapitalizedName(part.toLowerCase()) + " ");
                     }
                     String friendlyNameWithTrailingSpace = stringBuilder.toString();
-                    String friendlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
+                    String originalFrienlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
+                    String friendlyName= getLocaleTitle(staticSearchField, originalFrienlyName);
                     facetCategory.setFriendlyName(friendlyName);
 //                    logger.info("adding <<<" + staticSearchField + ":" + friendlyName + ">>>");
                     staticSolrFieldFriendlyNamesBySolrField.put(staticSearchField, friendlyName);
@@ -738,7 +735,6 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
             }
             facetCategory.setName(rangeFacet.getName());
             facetCategory.setFacetLabel(facetLabelList);
-            logger.info("BBBBBBBBBB JUAN " + facetCategory.getFriendlyName() + " " + facetCategory.getName());
 
             // reverse to show the newest citation year range at the top
             List<FacetLabel> facetLabelListReversed = new ArrayList<>();
@@ -937,4 +933,11 @@ private String getPermissionFilterQuery(DataverseRequest dataverseRequest, SolrQ
 
     }
 
-}
+    public String getLocaleTitle(String title, String originalTitle) {
+        try {
+            return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + title + ".title", "citation");
+        } catch (MissingResourceException e) {
+            return originalTitle;
+        }
+    }
+  }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
index 83405dd267d..ffde59d6ce5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
@@ -7,8 +7,6 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
@@ -16,8 +14,6 @@
  */
 public class DateUtil {
 
-    private static final Logger logger = Logger.getLogger(DateUtil.class.getCanonicalName());
-
     public static String formatDate(Date dateToformat) {
         String formattedDate;
         DateFormat dateFormatter;
@@ -25,7 +21,6 @@ public static String formatDate(Date dateToformat) {
             Locale currentLocale = BundleUtil.getCurrentLocale();
             dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, currentLocale);
             formattedDate = dateFormatter.format(dateToformat);
-
             return formattedDate;
         } catch(Exception e) {
             return null;
@@ -36,22 +31,13 @@ public static String formatDate(String dateToformat, String format) {
         String formattedDate = "";
         DateFormat inputFormat = new SimpleDateFormat(format);
         Date _date = null;
-        logger.log(Level.INFO, "******** DATE ******: Date from solr11: {0}", dateToformat);
         try {
             _date = inputFormat.parse(dateToformat);
             formattedDate = formatDate(_date);
             return formattedDate;
         } catch (ParseException e) {
-            try {
-                format="dd-MMM-yyyy";
-                inputFormat = new SimpleDateFormat(format);
-                _date = inputFormat.parse(dateToformat);
-                formattedDate = formatDate(_date);
-                return formattedDate;
-            } catch (ParseException ex) {
-                ex.printStackTrace();
-                return null;
-            }
+            e.printStackTrace();
+            return null;
         }
     }
 

From 2fd4be6cd87509ea32a627a4ed7c719daa060fd6 Mon Sep 17 00:00:00 2001
From: Juan Corrales <juancorr@gmail.com>
Date: Tue, 12 Mar 2019 15:49:30 +0100
Subject: [PATCH 4/6] Revert "5623 Facets translation issue"

This reverts commit fa2d5d7e794e92e7deb35207bff6e1f5206e3d56.
---
 .../iq/dataverse/DatasetFieldType.java        | 15 ++++++++++++---
 .../iq/dataverse/DataverseHeaderFragment.java |  2 +-
 .../dataverse/search/SearchServiceBean.java   | 19 ++++++++-----------
 .../harvard/iq/dataverse/util/DateUtil.java   | 18 ++++++++++++++++--
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
index cd3bea77ae9..e42e6c24eed 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
@@ -12,6 +12,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.MissingResourceException;
+import java.util.logging.Logger;
 import javax.faces.model.SelectItem;
 import javax.persistence.*;
 
@@ -30,6 +31,9 @@
 @Entity
 @Table(indexes = {@Index(columnList="metadatablock_id"),@Index(columnList="parentdatasetfieldtype_id")})
 public class DatasetFieldType implements Serializable, Comparable<DatasetFieldType> {
+    
+        private static final Logger logger = Logger.getLogger(DatasetFieldType.class.getCanonicalName());
+
 
     /**
      * The set of possible metatypes of the field. Used for validation and layout.
@@ -510,10 +514,11 @@ public int compareTo(DatasetFieldType o) {
     
     public String getDisplayName() {
         if (isHasParent() && !parentDatasetFieldType.getTitle().equals(title)) {
-        return parentDatasetFieldType.getLocaleTitle() + ": " + getLocaleTitle(); 
-        // The ": " is a solution to correct French and Spanish translation. Another solution is return only the parent title:
-        // return parentDatasetFieldType.getLocaleTitle();
+            logger.info (" AAAAAA JUAN getDisplayName isHasParent " + title);
+
+            return parentDatasetFieldType.getLocaleTitle()  + " " + getLocaleTitle();
         } else {
+            logger.info (" AAAAAA JUAN getDisplayName not isHasParent " + title);
             return getLocaleTitle();
         }
     }
@@ -563,12 +568,16 @@ public SolrField getSolrField() {
 
     public String getLocaleTitle() {
         if(getMetadataBlock()  == null) {
+            logger.info (" AAAAAA JUAN 1 " + title);
             return title;
         }
         else {
             try {
+                logger.info (" AAAAAA JUAN 2 " + "datasetfieldtype." + getName() + ".title" + "     " + getMetadataBlock().getName() + "   " + 
+                        BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".title", getMetadataBlock().getName()));
                 return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".title", getMetadataBlock().getName());
             } catch (MissingResourceException e) {
+            logger.info (" AAAAAA JUAN 3 " + title);
                 return title;
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
index 0085c395f1e..26944a0460d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 package edu.harvard.iq.dataverse;
-
+ 
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
index bde32705280..ebb69e7f227 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
@@ -29,7 +29,6 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
-import java.util.MissingResourceException;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -648,14 +647,18 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
              * the todo above but we need a way to lookup by Solr field, so
              * we'll build a hashmap
              */
+            logger.info("BBBBBBBBBB JUAN 1" + facetCategory.getFriendlyName() + " " + facetCategory.getName());
             for (DatasetFieldType datasetField : datasetFields) {
                 String solrFieldNameForDataset = datasetField.getSolrField().getNameFacetable();
                 String friendlyName = datasetField.getDisplayName();
                 if (solrFieldNameForDataset != null && facetField.getName().endsWith(datasetField.getTmpNullFieldTypeIdentifier())) {
+                    logger.info("BBBBBBBBBB JUAN 2.1");
                     // give it the non-friendly name so we remember to update the reference data script for datasets
                     facetCategory.setName(facetField.getName());
                 } else if (solrFieldNameForDataset != null && facetField.getName().equals(solrFieldNameForDataset)) {
+                    logger.info("BBBBBBBBBB JUAN 2.2");
                     if (friendlyName != null && !friendlyName.isEmpty()) {
+                        logger.info("BBBBBBBBBB JUAN 2.3");
                         facetCategory.setFriendlyName(friendlyName);
                         // stop examining available dataset fields. we found a match
                         break;
@@ -663,6 +666,7 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
                 }
                 datasetfieldFriendlyNamesBySolrField.put(datasetField.getSolrField().getNameFacetable(), friendlyName);
             }
+            logger.info("BBBBBBBBBB JUAN 3" + facetCategory.getFriendlyName() + " " + facetCategory.getName());
             /**
              * @todo get rid of this crazy reflection, per todo above... or
              * should we... let's put into a hash the friendly names of facet
@@ -683,8 +687,7 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
                         stringBuilder.append(getCapitalizedName(part.toLowerCase()) + " ");
                     }
                     String friendlyNameWithTrailingSpace = stringBuilder.toString();
-                    String originalFrienlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
-                    String friendlyName= getLocaleTitle(staticSearchField, originalFrienlyName);
+                    String friendlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
                     facetCategory.setFriendlyName(friendlyName);
 //                    logger.info("adding <<<" + staticSearchField + ":" + friendlyName + ">>>");
                     staticSolrFieldFriendlyNamesBySolrField.put(staticSearchField, friendlyName);
@@ -735,6 +738,7 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
             }
             facetCategory.setName(rangeFacet.getName());
             facetCategory.setFacetLabel(facetLabelList);
+            logger.info("BBBBBBBBBB JUAN " + facetCategory.getFriendlyName() + " " + facetCategory.getName());
 
             // reverse to show the newest citation year range at the top
             List<FacetLabel> facetLabelListReversed = new ArrayList<>();
@@ -933,11 +937,4 @@ private String getPermissionFilterQuery(DataverseRequest dataverseRequest, SolrQ
 
     }
 
-    public String getLocaleTitle(String title, String originalTitle) {
-        try {
-            return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + title + ".title", "citation");
-        } catch (MissingResourceException e) {
-            return originalTitle;
-        }
-    }
-  }
+}
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
index ffde59d6ce5..83405dd267d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
@@ -7,6 +7,8 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
@@ -14,6 +16,8 @@
  */
 public class DateUtil {
 
+    private static final Logger logger = Logger.getLogger(DateUtil.class.getCanonicalName());
+
     public static String formatDate(Date dateToformat) {
         String formattedDate;
         DateFormat dateFormatter;
@@ -21,6 +25,7 @@ public static String formatDate(Date dateToformat) {
             Locale currentLocale = BundleUtil.getCurrentLocale();
             dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, currentLocale);
             formattedDate = dateFormatter.format(dateToformat);
+
             return formattedDate;
         } catch(Exception e) {
             return null;
@@ -31,13 +36,22 @@ public static String formatDate(String dateToformat, String format) {
         String formattedDate = "";
         DateFormat inputFormat = new SimpleDateFormat(format);
         Date _date = null;
+        logger.log(Level.INFO, "******** DATE ******: Date from solr11: {0}", dateToformat);
         try {
             _date = inputFormat.parse(dateToformat);
             formattedDate = formatDate(_date);
             return formattedDate;
         } catch (ParseException e) {
-            e.printStackTrace();
-            return null;
+            try {
+                format="dd-MMM-yyyy";
+                inputFormat = new SimpleDateFormat(format);
+                _date = inputFormat.parse(dateToformat);
+                formattedDate = formatDate(_date);
+                return formattedDate;
+            } catch (ParseException ex) {
+                ex.printStackTrace();
+                return null;
+            }
         }
     }
 

From 719ecc83de56da4e4f2d8674b7737d766ebad503 Mon Sep 17 00:00:00 2001
From: Juan Corrales <juancorr@gmail.com>
Date: Tue, 12 Mar 2019 15:57:57 +0100
Subject: [PATCH 5/6] 5623 Facets translation issue

---
 .../harvard/iq/dataverse/DatasetFieldType.java | 15 +++------------
 .../iq/dataverse/DataverseHeaderFragment.java  |  2 +-
 .../iq/dataverse/search/SearchServiceBean.java | 18 ++++++++++--------
 .../harvard/iq/dataverse/util/DateUtil.java    | 18 ++----------------
 4 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
index e42e6c24eed..1a3671dc289 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
@@ -12,7 +12,6 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.MissingResourceException;
-import java.util.logging.Logger;
 import javax.faces.model.SelectItem;
 import javax.persistence.*;
 
@@ -31,9 +30,6 @@
 @Entity
 @Table(indexes = {@Index(columnList="metadatablock_id"),@Index(columnList="parentdatasetfieldtype_id")})
 public class DatasetFieldType implements Serializable, Comparable<DatasetFieldType> {
-    
-        private static final Logger logger = Logger.getLogger(DatasetFieldType.class.getCanonicalName());
-
 
     /**
      * The set of possible metatypes of the field. Used for validation and layout.
@@ -514,11 +510,10 @@ public int compareTo(DatasetFieldType o) {
     
     public String getDisplayName() {
         if (isHasParent() && !parentDatasetFieldType.getTitle().equals(title)) {
-            logger.info (" AAAAAA JUAN getDisplayName isHasParent " + title);
-
-            return parentDatasetFieldType.getLocaleTitle()  + " " + getLocaleTitle();
+            return parentDatasetFieldType.getLocaleTitle()  + ": " + getLocaleTitle();
+            // The ": " is a solution to French and Spanish tranlation. Another solution is return onlu the parent title:
+            // return parentDatasetFieldType.getLocaleTitle()
         } else {
-            logger.info (" AAAAAA JUAN getDisplayName not isHasParent " + title);
             return getLocaleTitle();
         }
     }
@@ -568,16 +563,12 @@ public SolrField getSolrField() {
 
     public String getLocaleTitle() {
         if(getMetadataBlock()  == null) {
-            logger.info (" AAAAAA JUAN 1 " + title);
             return title;
         }
         else {
             try {
-                logger.info (" AAAAAA JUAN 2 " + "datasetfieldtype." + getName() + ".title" + "     " + getMetadataBlock().getName() + "   " + 
-                        BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".title", getMetadataBlock().getName()));
                 return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + getName() + ".title", getMetadataBlock().getName());
             } catch (MissingResourceException e) {
-            logger.info (" AAAAAA JUAN 3 " + title);
                 return title;
             }
         }
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
index 26944a0460d..0085c395f1e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 package edu.harvard.iq.dataverse;
- 
+
 import edu.harvard.iq.dataverse.authorization.groups.GroupServiceBean;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import static edu.harvard.iq.dataverse.util.JsfHelper.JH;
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
index ebb69e7f227..329ab0b5f46 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.MissingResourceException;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -647,18 +648,14 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
              * the todo above but we need a way to lookup by Solr field, so
              * we'll build a hashmap
              */
-            logger.info("BBBBBBBBBB JUAN 1" + facetCategory.getFriendlyName() + " " + facetCategory.getName());
             for (DatasetFieldType datasetField : datasetFields) {
                 String solrFieldNameForDataset = datasetField.getSolrField().getNameFacetable();
                 String friendlyName = datasetField.getDisplayName();
                 if (solrFieldNameForDataset != null && facetField.getName().endsWith(datasetField.getTmpNullFieldTypeIdentifier())) {
-                    logger.info("BBBBBBBBBB JUAN 2.1");
                     // give it the non-friendly name so we remember to update the reference data script for datasets
                     facetCategory.setName(facetField.getName());
                 } else if (solrFieldNameForDataset != null && facetField.getName().equals(solrFieldNameForDataset)) {
-                    logger.info("BBBBBBBBBB JUAN 2.2");
                     if (friendlyName != null && !friendlyName.isEmpty()) {
-                        logger.info("BBBBBBBBBB JUAN 2.3");
                         facetCategory.setFriendlyName(friendlyName);
                         // stop examining available dataset fields. we found a match
                         break;
@@ -666,7 +663,6 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
                 }
                 datasetfieldFriendlyNamesBySolrField.put(datasetField.getSolrField().getNameFacetable(), friendlyName);
             }
-            logger.info("BBBBBBBBBB JUAN 3" + facetCategory.getFriendlyName() + " " + facetCategory.getName());
             /**
              * @todo get rid of this crazy reflection, per todo above... or
              * should we... let's put into a hash the friendly names of facet
@@ -687,7 +683,8 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
                         stringBuilder.append(getCapitalizedName(part.toLowerCase()) + " ");
                     }
                     String friendlyNameWithTrailingSpace = stringBuilder.toString();
-                    String friendlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
+                    String originalFrienlyName = friendlyNameWithTrailingSpace.replaceAll(" $", "");
+                    String friendlyName= getLocaleTitle(staticSearchField, originalFrienlyName);
                     facetCategory.setFriendlyName(friendlyName);
 //                    logger.info("adding <<<" + staticSearchField + ":" + friendlyName + ">>>");
                     staticSolrFieldFriendlyNamesBySolrField.put(staticSearchField, friendlyName);
@@ -738,8 +735,6 @@ public SolrQueryResponse search(DataverseRequest dataverseRequest, List<Datavers
             }
             facetCategory.setName(rangeFacet.getName());
             facetCategory.setFacetLabel(facetLabelList);
-            logger.info("BBBBBBBBBB JUAN " + facetCategory.getFriendlyName() + " " + facetCategory.getName());
-
             // reverse to show the newest citation year range at the top
             List<FacetLabel> facetLabelListReversed = new ArrayList<>();
             ListIterator<FacetLabel> li = facetLabelList.listIterator(facetLabelList.size());
@@ -937,4 +932,11 @@ private String getPermissionFilterQuery(DataverseRequest dataverseRequest, SolrQ
 
     }
 
+    public String getLocaleTitle(String title, String originalTitle) {
+        try {
+            return BundleUtil.getStringFromPropertyFile("datasetfieldtype." + title + ".title", "citation");
+        } catch (MissingResourceException e) {
+            return originalTitle;
+        }
+    }
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
index 83405dd267d..ffde59d6ce5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
+++ b/src/main/java/edu/harvard/iq/dataverse/util/DateUtil.java
@@ -7,8 +7,6 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
@@ -16,8 +14,6 @@
  */
 public class DateUtil {
 
-    private static final Logger logger = Logger.getLogger(DateUtil.class.getCanonicalName());
-
     public static String formatDate(Date dateToformat) {
         String formattedDate;
         DateFormat dateFormatter;
@@ -25,7 +21,6 @@ public static String formatDate(Date dateToformat) {
             Locale currentLocale = BundleUtil.getCurrentLocale();
             dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, currentLocale);
             formattedDate = dateFormatter.format(dateToformat);
-
             return formattedDate;
         } catch(Exception e) {
             return null;
@@ -36,22 +31,13 @@ public static String formatDate(String dateToformat, String format) {
         String formattedDate = "";
         DateFormat inputFormat = new SimpleDateFormat(format);
         Date _date = null;
-        logger.log(Level.INFO, "******** DATE ******: Date from solr11: {0}", dateToformat);
         try {
             _date = inputFormat.parse(dateToformat);
             formattedDate = formatDate(_date);
             return formattedDate;
         } catch (ParseException e) {
-            try {
-                format="dd-MMM-yyyy";
-                inputFormat = new SimpleDateFormat(format);
-                _date = inputFormat.parse(dateToformat);
-                formattedDate = formatDate(_date);
-                return formattedDate;
-            } catch (ParseException ex) {
-                ex.printStackTrace();
-                return null;
-            }
+            e.printStackTrace();
+            return null;
         }
     }
 

From 5d315e7f5ef6e7a55884a54aab7a63a7b8ce71cd Mon Sep 17 00:00:00 2001
From: Juan Corrales <juancorr@gmail.com>
Date: Tue, 12 Mar 2019 16:00:43 +0100
Subject: [PATCH 6/6] 5623 Facets translation issue

---
 src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
index 1a3671dc289..dc6bf6f2641 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DatasetFieldType.java
@@ -511,7 +511,7 @@ public int compareTo(DatasetFieldType o) {
     public String getDisplayName() {
         if (isHasParent() && !parentDatasetFieldType.getTitle().equals(title)) {
             return parentDatasetFieldType.getLocaleTitle()  + ": " + getLocaleTitle();
-            // The ": " is a solution to French and Spanish tranlation. Another solution is return onlu the parent title:
+            // The ": " is a solution to French and Spanish translation. Another solution is return only the parent title:
             // return parentDatasetFieldType.getLocaleTitle()
         } else {
             return getLocaleTitle();