From b5e0d1953695a6f483053e30d2d3fcf4b29982d2 Mon Sep 17 00:00:00 2001 From: Marco Date: Mon, 16 Dec 2024 15:39:49 +0100 Subject: [PATCH] Fix locales Reordering locales will make English default now. Additionally, one translation bug was fixed. --- android/app/build.gradle | 4 ++-- lib/l10n/app_de.arb | 2 +- lib/main.dart | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 272247b..d0c0f06 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -33,8 +33,8 @@ android { applicationId = "de.swgross.calorimeter" minSdk = flutter.minSdkVersion targetSdk = flutter.targetSdkVersion - versionCode = 2 - versionName = "1.0.2" + versionCode = 3 + versionName = "1.0.3" } signingConfigs { diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index d08a2a4..d9c6c2a 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -2,7 +2,7 @@ "ok": "OK", "name": "Name", "amount": "Menge", - "amountPer": "Amount in 100 g/ml", + "amountPer": "Menge in 100 g/ml", "kcalper": "kcal pro 100 g/ml", "kcalToday": "kcal heute", "menu": "MenĂ¼", diff --git a/lib/main.dart b/lib/main.dart index c9c9bc4..2b8e012 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -77,7 +77,6 @@ class MainApp extends StatelessWidget { } return MaterialApp.router( - //locale: Locale('de'), routerConfig: GoRouter( routes: [ GoRoute( @@ -91,7 +90,10 @@ class MainApp extends StatelessWidget { ], ), localizationsDelegates: AppLocalizations.localizationsDelegates, - supportedLocales: AppLocalizations.supportedLocales, + supportedLocales: [ + Locale('en'), + Locale('de'), + ], theme: ThemeData( dividerTheme: const DividerThemeData(space: 2), colorScheme: ColorScheme.fromSeed(