diff --git a/covas_mobile/lib/l10n/app_en.arb b/covas_mobile/lib/l10n/app_en.arb index 92e78ac..524b604 100644 --- a/covas_mobile/lib/l10n/app_en.arb +++ b/covas_mobile/lib/l10n/app_en.arb @@ -107,5 +107,5 @@ "enter_existing_pseudo": "Enter a existing pseudo", "remembr_me": "Remember me", "new_user": "New User? Create Account", -"sign_in": "Sign in" +"sign_in": "Sign in", } \ No newline at end of file diff --git a/covas_mobile/lib/pages/MapboxPages.dart b/covas_mobile/lib/pages/MapboxPages.dart index 8e005e9..8a8b412 100644 --- a/covas_mobile/lib/pages/MapboxPages.dart +++ b/covas_mobile/lib/pages/MapboxPages.dart @@ -13,6 +13,11 @@ import '../variable/globals.dart' as globals; import '../classes/MyDrawer.dart'; import '../classes/auth_service.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:provider/provider.dart'; +import '../locale_provider.dart'; // + void main() async { await dotenv.load(fileName: ".env"); // Load .env file runApp(const MyApp()); @@ -69,8 +74,8 @@ class _MapboxPagesState extends State with ShowAlertDialog { void _initToken() { mapboxAccessToken = dotenv.env['MAPBOX_ACCESS_TOKEN'] ?? ''; if (mapboxAccessToken.isEmpty) { - showAlertDialog( - context, "Erreur Mapbox", "Mapbox Access Token is not available."); + showAlertDialog(context, AppLocalizations.of(context)?.error ?? "Error", + "Mapbox Access Token is not available."); } } @@ -95,43 +100,37 @@ class _MapboxPagesState extends State with ShowAlertDialog { _handleErrorResponse(responseGet.statusCode); } } else { - showAlertDialog(context, "Erreur serveur", "Invalid cache."); + showAlertDialog(context, AppLocalizations.of(context)?.error ?? "Error", + AppLocalizations.of(context)?.invalid_cache ?? "Invalid cache."); } } void _handleErrorResponse(int statusCode) { - String text; - switch (statusCode) { - case 400: - text = "Bad Request."; - break; - case 406: - text = "Incorrect Password."; - break; - case 404: - text = "User Not Found."; - break; - case 403: - text = "Action not permitted."; - break; - case 410: - text = "Invalid Token."; - break; - case 500: - text = "Internal Server Error."; - break; - default: - text = "Unknown error."; - } - showAlertDialog(context, "Erreur serveur", text); + final messages = { + 400: AppLocalizations.of(context)?.request_error ?? + "Poorly constructed query", + 406: AppLocalizations.of(context)?.incorrect_password ?? + "Incorrect password", + 404: AppLocalizations.of(context)?.unknown_user ?? "Unknown user", + 403: AppLocalizations.of(context)?.disabled_user ?? "Disabled user", + 410: AppLocalizations.of(context)?.invalid_token ?? "Invalid token", + 500: AppLocalizations.of(context)?.internal_error_server ?? + "Internal error server" + }; + + final errorMessage = messages[statusCode] ?? + AppLocalizations.of(context)?.unknown_error_auth ?? + "Unknown error auth"; + showAlertDialog( + context, AppLocalizations.of(context)?.error ?? "Error", errorMessage); } Future _getUserLocation() async { try { bool serviceEnabled = await Geolocator.isLocationServiceEnabled(); if (!serviceEnabled) { - showAlertDialog( - context, "Erreur de service", "Location services are disabled."); + showAlertDialog(context, AppLocalizations.of(context)?.error ?? "Error", + "Location services are disabled."); return; } @@ -139,14 +138,16 @@ class _MapboxPagesState extends State with ShowAlertDialog { if (permission == LocationPermission.denied) { permission = await Geolocator.requestPermission(); if (permission == LocationPermission.denied) { - showAlertDialog(context, "Erreur de permission", + showAlertDialog( + context, + AppLocalizations.of(context)?.error ?? "Error", "Location permissions are denied."); return; } } if (permission == LocationPermission.deniedForever) { - showAlertDialog(context, "Erreur de permission", + showAlertDialog(context, AppLocalizations.of(context)?.error ?? "Error", "Location permissions are permanently denied. Enable them in settings."); return; } @@ -158,7 +159,6 @@ class _MapboxPagesState extends State with ShowAlertDialog { locationSettings: locationSettings); } on LocationServiceDisabledException { // Handle location services disabled - print('Location services are disabled.'); position = await Geolocator.getLastKnownPosition(); if (position == null) { print('No last known position available.'); @@ -180,7 +180,8 @@ class _MapboxPagesState extends State with ShowAlertDialog { _initToken(); _getEventInfo(); } catch (e) { - showAlertDialog(context, "Erreur geo", "Failed to get user location: $e"); + showAlertDialog(context, AppLocalizations.of(context)?.error ?? "Error", + "Failed to get user location: $e"); } } @@ -253,7 +254,7 @@ class _MapboxPagesState extends State with ShowAlertDialog { currentRouteLine = null; } if (!isUserPositionInitialized) { - showAlertDialog(context, "Erreur de position", + showAlertDialog(context, AppLocalizations.of(context)?.error ?? "Error", "User position is not yet initialized. Try again."); return; } @@ -293,7 +294,7 @@ class _MapboxPagesState extends State with ShowAlertDialog { _zoomToFitRoute(routeCoordinates); } } else { - showAlertDialog(context, "Erreur de coordonée", + showAlertDialog(context, AppLocalizations.of(context)?.error ?? "Error", "Invalid coordinates or user position."); } }