Index: messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java
===================================================================
--- messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java (revision 98603)
+++ messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java (working copy)
@@ -25,6 +25,7 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
+import java.util.Locale;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -8685,5 +8686,8 @@
return false;
}
}
+ public Locale getUserLocale(){
+ return new ResourceLoader().getLocale();
+ }
}
Index: messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
===================================================================
--- messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java (revision 98603)
+++ messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java (working copy)
@@ -26,6 +26,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
+import java.util.Locale;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -1505,11 +1506,11 @@
replyToSubject = title;
// format the created date according to the setting in the bundle
- SimpleDateFormat formatter_date = new SimpleDateFormat(getResourceBundleString("date_format_date"));
+ SimpleDateFormat formatter_date = new SimpleDateFormat(getResourceBundleString("date_format_date"), new ResourceLoader().getLocale());
formatter_date.setTimeZone(TimeService.getLocalTimeZone());
String formattedCreateDate = formatter_date.format(pm.getCreated());
- SimpleDateFormat formatter_date_time = new SimpleDateFormat(getResourceBundleString("date_format_time"));
+ SimpleDateFormat formatter_date_time = new SimpleDateFormat(getResourceBundleString("date_format_time"), new ResourceLoader().getLocale());
formatter_date_time.setTimeZone(TimeService.getLocalTimeZone());
String formattedCreateTime = formatter_date_time.format(pm.getCreated());
@@ -1577,7 +1578,7 @@
forwardSubject = title;
// format the created date according to the setting in the bundle
- SimpleDateFormat formatter = new SimpleDateFormat(getResourceBundleString("date_format"));
+ SimpleDateFormat formatter = new SimpleDateFormat(getResourceBundleString("date_format"), new ResourceLoader().getLocale());
formatter.setTimeZone(TimeService.getLocalTimeZone());
String formattedCreateDate = formatter.format(pm.getCreated());
@@ -1674,11 +1675,11 @@
// format the created date according to the setting in the bundle
- SimpleDateFormat formatter = new SimpleDateFormat(getResourceBundleString("date_format"));
+ SimpleDateFormat formatter = new SimpleDateFormat(getResourceBundleString("date_format"), new ResourceLoader().getLocale());
formatter.setTimeZone(TimeService.getLocalTimeZone());
String formattedCreateDate = formatter.format(pm.getCreated());
- SimpleDateFormat formatter_date_time = new SimpleDateFormat(getResourceBundleString("date_format_time"));
+ SimpleDateFormat formatter_date_time = new SimpleDateFormat(getResourceBundleString("date_format_time"), new ResourceLoader().getLocale());
formatter_date_time.setTimeZone(TimeService.getLocalTimeZone());
String formattedCreateTime = formatter_date_time.format(pm.getCreated());
@@ -5114,4 +5115,7 @@
return null;
}
+ public Locale getUserLocale(){
+ return new ResourceLoader().getLocale();
+ }
}
Index: messageforums-app/src/webapp/jsp/dfMessageReply.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/dfMessageReply.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/dfMessageReply.jsp (working copy)
@@ -50,7 +50,7 @@
-
+
@@ -115,7 +115,7 @@
-
');">
+
');">
:
Index: messageforums-app/src/webapp/jsp/dfMessageReplyThread.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/dfMessageReplyThread.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/dfMessageReplyThread.jsp (working copy)
@@ -49,7 +49,7 @@
-
+
@@ -117,7 +117,7 @@
-
');">
+
');">
:
Index: messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp (working copy)
@@ -307,10 +307,10 @@
-
+
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/message/dfMsgGrade.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/message/dfMsgGrade.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/message/dfMsgGrade.jsp (working copy)
@@ -107,7 +107,7 @@
-
+
<%-- Attachments --%>
Index: messageforums-app/src/webapp/jsp/discussionForum/message/dfPendingMessages.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/message/dfPendingMessages.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/message/dfPendingMessages.jsp (working copy)
@@ -102,7 +102,7 @@
-
+
<%--designNote: need to i18N --%>
Index: messageforums-app/src/webapp/jsp/discussionForum/message/dfViewMessage.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/message/dfViewMessage.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/message/dfViewMessage.jsp (working copy)
@@ -241,7 +241,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/message/dfViewThreadBodyInclude.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/message/dfViewThreadBodyInclude.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/message/dfViewThreadBodyInclude.jsp (working copy)
@@ -65,10 +65,10 @@
<%--date --%>
-
+
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/message/printFriendly.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/message/printFriendly.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/message/printFriendly.jsp (working copy)
@@ -43,7 +43,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/message/printFriendlyThread.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/message/printFriendlyThread.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/message/printFriendlyThread.jsp (working copy)
@@ -41,7 +41,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsAllAuthoredMsgForOneUser.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsAllAuthoredMsgForOneUser.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsAllAuthoredMsgForOneUser.jsp (working copy)
@@ -253,7 +253,7 @@
-
+
<% if(!isDialogBox){ %>
Index: messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsDisplayInThread.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsDisplayInThread.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsDisplayInThread.jsp (working copy)
@@ -73,7 +73,7 @@
-
+
@@ -114,7 +114,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsFullTextForOne.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsFullTextForOne.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsFullTextForOne.jsp (working copy)
@@ -84,7 +84,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsListByAllTopics.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsListByAllTopics.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsListByAllTopics.jsp (working copy)
@@ -70,7 +70,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsUser.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsUser.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsUser.jsp (working copy)
@@ -221,7 +221,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/statistics/printFriendlyAllAuthoredMsg.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/statistics/printFriendlyAllAuthoredMsg.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/statistics/printFriendlyAllAuthoredMsg.jsp (working copy)
@@ -49,7 +49,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/statistics/printFriendlyDisplayInThread.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/statistics/printFriendlyDisplayInThread.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/statistics/printFriendlyDisplayInThread.jsp (working copy)
@@ -50,7 +50,7 @@
-
+
@@ -73,7 +73,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/discussionForum/statistics/printFriendlyFullTextForOne.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/discussionForum/statistics/printFriendlyFullTextForOne.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/discussionForum/statistics/printFriendlyFullTextForOne.jsp (working copy)
@@ -51,7 +51,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/privateMsg/pvtMsg.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/privateMsg/pvtMsg.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/privateMsg/pvtMsg.jsp (working copy)
@@ -149,10 +149,10 @@
-
+
-
+
@@ -221,10 +221,10 @@
-
+
-
+
Index: messageforums-app/src/webapp/jsp/privateMsg/pvtMsgDelete.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/privateMsg/pvtMsgDelete.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/privateMsg/pvtMsgDelete.jsp (working copy)
@@ -53,7 +53,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/privateMsg/pvtMsgDetail.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/privateMsg/pvtMsgDetail.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/privateMsg/pvtMsgDetail.jsp (working copy)
@@ -147,7 +147,7 @@
-
+
Index: messageforums-app/src/webapp/jsp/privateMsg/pvtMsgEx.jsp
===================================================================
--- messageforums-app/src/webapp/jsp/privateMsg/pvtMsgEx.jsp (revision 98603)
+++ messageforums-app/src/webapp/jsp/privateMsg/pvtMsgEx.jsp (working copy)
@@ -67,10 +67,10 @@
-
+
-
+
@@ -129,10 +129,10 @@
-
+
-
+