Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Showing only changes of commit 195377fada - Show all commits

View File

@@ -27,8 +27,8 @@ public class CouponLoader implements Loader<List<Coupon>> {
FileIO<ArrayList<Coupon>> fileIO = new FileIO<>();
String selectedLanguage = context.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("Language", "nl");
String fileName = "locations";
// choose the coupon.json based of the selected language
String fileName = "coupons";
// choose the coupons.json based of the selected language
if (!selectedLanguage.equals("en")) {
fileName += "-" + selectedLanguage;
}