X-Git-Url: http://git.pk910.de/?p=DHBWCampusApp.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fde%2Fdhbwloe%2Fcampusapp%2Ffragments%2FDashboardMensa.java;h=ccc2589de39d9e6f7c4b650f02223d5252341565;hp=2d473a54a88c58254bde4bae59fdf8db18b2408d;hb=cea4ee15ef92f521ae962404bd1b3c25042219fa;hpb=9a28e7b4c1520f629721693a04b4978fec9692e7 diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java index 2d473a5..ccc2589 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java @@ -17,6 +17,7 @@ import java.util.Date; import de.dhbwloe.campusapp.CampusAppContext; import de.dhbwloe.campusapp.CampusAppFragment; import de.dhbwloe.campusapp.R; +import de.dhbwloe.campusapp.Tools; import de.dhbwloe.campusapp.mensaplan.MensaTagesplan; /** @@ -90,13 +91,11 @@ public class DashboardMensa extends CampusAppFragment { else if(now < date + (86400*2)) datetext = AppContext.getResString(R.string.dashboard_calendar_tomorrow); else { - int weekdayResIds[] = new int[] { R.string.week_sunday, R.string.week_monday, R.string.week_tuesday, R.string.week_wednesday, R.string.week_thursday, R.string.week_friday, R.string.week_saturday }; - Calendar cal = Calendar.getInstance(); - cal.setTime(new Date(date * 1000)); - int dow = cal.get(Calendar.DAY_OF_WEEK); - SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM"); + Date dateObj = new Date(date * 1000); + String dayStr = Tools.getWeekdayString(dateObj); + SimpleDateFormat dateFormat = new SimpleDateFormat(AppContext.getResString(R.string.timeformat_dashboard_mensa)); - datetext = AppContext.getResString(weekdayResIds[dow]) + ", " + dateFormat.format(cal.getTime()); + datetext = dayStr + ", " + dateFormat.format(dateObj); } return datetext; }