=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js	2015-09-08 09:15:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js	2015-09-08 10:17:44 +0000
@@ -198,10 +198,7 @@
 }
 
 function getCalendarSetting()
-{
-    if(localStorage['CALENDAR_SETTING']){
-       return; 
-    }    
+{       
     var def = $.Deferred();
 
     $.ajax({

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js	2015-09-03 16:09:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js	2015-09-08 10:17:44 +0000
@@ -177,11 +177,7 @@
 }
 
 function getCalendarSetting()
-{
-    if(localStorage['CALENDAR_SETTING']){
-       return; 
-    }
-    
+{   
     var def = $.Deferred();
     var promise = def.promise();
     promise = promise.then( getD2Object(null, 'CALENDAR_SETTING', '../api/systemSettings', 'key=keyCalendar&key=keyDateFormat', 'localStorage') );