alpha 0.0.2

[DHBWCampusApp.git] / app / src / main / java / de / dhbwloe / campusapp / fragments / DashboardMensa.java

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 2d473a54a88c58254bde4bae59fdf8db18b2408d..ccc2589de39d9e6f7c4b650f02223d5252341565 100644 (file)
--- 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;
     }