garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

format date using client timezone

Browse Source
This commit is contained in:
Athou
2013-04-13 13:04:37 +02:00
parent c2ecaed0af
commit f0dd91cd39
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/commafeed/frontend/rest/JSONMessageBodyReaderWriter.java
View File

@@ -11,6 +11,8 @@ import java.lang.reflect.Type;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
import javax.ws.rs.Consumes;
import javax.ws.rs.Produces;
@@ -24,6 +26,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.commons.lang.time.DateUtils;
import com.commafeed.frontend.CommaFeedSession;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
@@ -107,7 +110,14 @@ public class JSONMessageBodyReaderWriter implements MessageBodyWriter<Object>,
Date now = Calendar.getInstance().getTime();
String format = DateUtils.isSameDay(now, src) ? TIME_FORMAT
: DAY_FORMAT;
return new JsonPrimitive(new SimpleDateFormat(format).format(src));
Locale locale = CommaFeedSession.get().getLocale();
Calendar calendar = Calendar.getInstance(locale);
TimeZone timeZone = calendar.getTimeZone();
SimpleDateFormat dateFormat = new SimpleDateFormat(format);
dateFormat.setTimeZone(timeZone);
return new JsonPrimitive(dateFormat.format(src));
}
}