diff --git a/covas_mobile/lib/l10n/app_de.arb b/covas_mobile/lib/l10n/app_de.arb index 7c76c02..9194d0a 100644 --- a/covas_mobile/lib/l10n/app_de.arb +++ b/covas_mobile/lib/l10n/app_de.arb @@ -128,5 +128,7 @@ "upload_error": "Fehler beim Hochladen des Bildes", "event_added": "Veranstaltung hinzugefügt", "unknown_error": "Unbekannter Fehler", - "app_error": "Anwendungsfehler" + "app_error": "Anwendungsfehler", + "at": "um", + "to_date": "bis" } diff --git a/covas_mobile/lib/l10n/app_en.arb b/covas_mobile/lib/l10n/app_en.arb index 361954d..2f29651 100644 --- a/covas_mobile/lib/l10n/app_en.arb +++ b/covas_mobile/lib/l10n/app_en.arb @@ -130,5 +130,7 @@ "upload_error": "Error when image uploading", "event_added": "Event added", "unknown_error": "Unknown error", -"app_error": "Application error" +"app_error": "Application error", +"at": "at", +"to_date": "to" } \ No newline at end of file diff --git a/covas_mobile/lib/l10n/app_fr.arb b/covas_mobile/lib/l10n/app_fr.arb index 5cdada9..c3dd1fd 100644 --- a/covas_mobile/lib/l10n/app_fr.arb +++ b/covas_mobile/lib/l10n/app_fr.arb @@ -130,5 +130,8 @@ "upload_error": "Erreur lors de l'upload d'image", "event_added": "Évènement ajouté", "unknown_error": "Erreur inconnue", -"app_error": "Erreur d'application" +"app_error": "Erreur d'application", +"at": "à", +"to_date": "jusqu'à" + } \ No newline at end of file diff --git a/covas_mobile/lib/pages/ItemMenu.dart b/covas_mobile/lib/pages/ItemMenu.dart index 896a66d..7451e50 100644 --- a/covas_mobile/lib/pages/ItemMenu.dart +++ b/covas_mobile/lib/pages/ItemMenu.dart @@ -129,20 +129,31 @@ class _ItemMenuState extends State with ShowAlertDialog { final responseBody = utf8.decode(responseGet.bodyBytes); final event = Events.fromJson(jsonDecode(responseBody)); - + final locale = Provider.of(context, listen: false) + .locale + ?.toString() ?? + 'en_US'; final startDate = DateTime.parse(event.startDate ?? DateTime.now().toString()); + //final date = DateFormat.yMd().format(startDate); + //final time = DateFormat.Hm().format(startDate); final endDate = DateTime.parse(event.endDate ?? DateTime.now().toString()); - + String separator = AppLocalizations.of(context)?.at ?? "at"; final formattedStartDate = - "${DateFormat.yMd().format(startDate)} ${DateFormat.Hm().format(startDate)}"; + DateFormat("EEEE d MMMM y '${separator}' HH:mm", locale) + .format(startDate); + final formattedEndDate = - "${DateFormat.yMd().format(endDate)} ${DateFormat.Hm().format(endDate)}"; + DateFormat("EEEE d MMMM y '${separator}' HH:mm", locale) + .format(endDate); + + String link = AppLocalizations.of(context)?.to_date ?? "to"; setState(() { eventName = event.name ?? ""; - eventStartDate = "$formattedStartDate à $formattedEndDate"; + + eventStartDate = "$formattedStartDate ${link} $formattedEndDate"; organizers = List.from(event.organizers ?? []); place = event.place ?? ""; imgUrl = event.imgUrl ?? "";