=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java	2014-04-27 08:47:17 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java	2014-04-27 09:03:54 +0000
@@ -99,10 +99,10 @@
     @Override
     public String formattedDate( DateUnit dateUnit )
     {
-        DateTime dateTime = dateUnit.toDateTime();
-        DateTimeFormatter format = DateTimeFormat.forPattern( defaultDateFormat() );
-
-        return format.print( dateTime );
+        return defaultDateFormat()
+            .replace( "yyyy", String.format( "%04d", dateUnit.getYear() ) )
+            .replace( "MM", String.format( "%02d", dateUnit.getMonth() ) )
+            .replace( "dd", String.format( "%02d", dateUnit.getDay() ) );
     }
 
     @Override

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java	2014-04-27 08:49:14 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java	2014-04-27 09:03:54 +0000
@@ -64,13 +64,6 @@
         return "nepali";
     }
 
-    // TODO Add proper local date format for Nepali, can't use default.. since the month numbers are outside the valid ISO 8601 range
-    @Override
-    public String formattedDate( DateUnit dateUnit )
-    {
-        return super.formattedDate( dateUnit );
-    }
-
     @Override
     public DateUnit toIso( DateUnit dateUnit )
     {