Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java	(revision 76360)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java	(working copy)
@@ -217,8 +217,8 @@
   private AgentFacade deliveryAgent;
 
   // lydial added for timezone conversion 
-  //private String display_dateFormat= ContextUtil.getLocalizedString("org.sakaiproject.tool.assessment.bundle.GeneralMessages","output_date_no_sec");
-  private String display_dateFormat= "yyyy-MMM-dd hh:mm aaa";
+  private String display_dateFormat= ContextUtil.getLocalizedString("org.sakaiproject.tool.assessment.bundle.GeneralMessages","output_date_no_sec");
+  //private String display_dateFormat= "yyyy-MMM-dd hh:mm aaa";
   private SimpleDateFormat displayFormat = new SimpleDateFormat(display_dateFormat);
 
   private boolean noQuestions = false;
Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBeanie.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBeanie.java	(revision 76360)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBeanie.java	(working copy)
@@ -82,8 +82,8 @@
   private String scoringOption;
    
   // lydial added for timezone conversion 
-  //private String display_dateFormat= ContextUtil.getLocalizedString("org.sakaiproject.tool.assessment.bundle.GeneralMessages","output_date_no_sec");
-  private String display_dateFormat= "yyyy-MMM-dd hh:mm aaa";
+  private String display_dateFormat= ContextUtil.getLocalizedString("org.sakaiproject.tool.assessment.bundle.GeneralMessages","output_date_no_sec");
+  //private String display_dateFormat= "yyyy-MMM-dd hh:mm aaa";
   private SimpleDateFormat displayFormat = new SimpleDateFormat(display_dateFormat);
   private boolean hasRandomDrawPart;
   private boolean isAssessmentRetractForEdit;
Index: samigo-app/src/webapp/jsf/author/authorSettings.jsp
===================================================================
--- samigo-app/src/webapp/jsf/author/authorSettings.jsp	(revision 76360)
+++ samigo-app/src/webapp/jsf/author/authorSettings.jsp	(working copy)
@@ -712,7 +712,7 @@
 		  <h:outputText value=" "/>
 		  <h:outputText value=" "/>
           <samigo:datePicker value="#{assessmentSettings.feedbackDateString}" size="25" id="feedbackDate" >
-            <f:convertDateTime pattern="#{generalMessages.output_date_picker}" />
+            <f:convertDateTime pattern="#{generalMessages.output_data_picker_w_sec}" />
           </samigo:datePicker>
         </h:panelGrid>