[DS-469] DCDate.displayDate(false,*) displays only year

N.B. Removed reference from 1.6.1 in CHANGES as this looks like it was accidentally added in revision 4958) git-svn-id: http://scm.dspace.org/svn/repo/dspace/branches/dspace-1_6_x@5245 9c30dcfa-912a-0410-8fc2-9e0234be79fd
helix84 · Aug 8, 2010 · e57e224 · e57e224
1 parent 612508d
commit e57e224
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/content/DCDate.java b/dspace-api/src/main/java/org/dspace/content/DCDate.java
@@ -685,17 +685,17 @@ public String displayDate(boolean showTime, boolean isLocalTime, Locale locale)
                                      dd.getHourGMT(), dd.getMinuteGMT(), dd.getSecondGMT());
             }
         }
-        else if (granularity == DateGran.DAY)
+        else if (granularity == DateGran.YEAR)
         {
-            return String.format("%d-%s-%4d", dd.getDay(), monthName, dd.getYear());
+            return String.format("%4d", dd.getYear());
         }
         else if (granularity == DateGran.MONTH)
         {
             return String.format("%s-%4d", monthName, dd.getYear());
         }
         else
         {
-            return String.format("%4d", dd.getYear());
+            return String.format("%d-%s-%4d", dd.getDay(), monthName, dd.getYear());
         }
     }
 }
diff --git a/dspace/CHANGES b/dspace/CHANGES
@@ -1,5 +1,12 @@
+1.6.3
+=====
+
 (Flavio Botelho)
-[DS-563] Multiple spaces in between words in advanced search will make the search return nothing
+ - [DS-563] Multiple spaces in between words in advanced search will make the search return nothing
+
+(Mark Wood)
+ - [DS-469] DCDate.displayDate(false,*) displays only year
+
 
 1.6.2
 =====
@@ -82,9 +89,6 @@
  - [DS-526] ItemUpdate - script update
  - [DS-572] Batch metadata editor fails to notice change of item's owning collection
 
-(Mark Wood)
- - [DS-469] DCDate.displayDate(false,*) displays only year
-
  (Ivan Masar)
  - [DS-515] Czech localization of 1.5.2