Merge branch 'master' into german-trans

2021-05-23 07:45:53 -05:00 · 2021-05-23 07:45:53 -05:00 · a74f89fc7b
parent 70fe6c8bbc 89ca142f40
commit a74f89fc7b
2 changed files with 6 additions and 2 deletions
--- a/src/ui/flutter_app/lib/l10n/intl_de.arb
+++ b/src/ui/flutter_app/lib/l10n/intl_de.arb
@ -1,5 +1,5 @@
 {
-  "@@locale": "en",
+  "@@locale": "de",
  "appName": "Mühle",
  "@appName": {
    "description": "The App name"
--- a/src/ui/flutter_app/lib/main.dart
+++ b/src/ui/flutter_app/lib/main.dart
@ -134,7 +134,11 @@ class _SanmillAppState extends State<SanmillApp> {
      supportedLocales: [
        const Locale('en', ''), // English, no country code
        const Locale.fromSubtags(
-            languageCode: 'zh'), // Chinese *See Advanced Locales below*
+          languageCode: 'de',
+        ), // Deutsch *See Advanced Locales below*
+        const Locale.fromSubtags(
+          languageCode: 'zh',
+        ), // Chinese *See Advanced Locales below*
        // ... other locales the app supports
      ],
      theme: ThemeData(primarySwatch: AppTheme.appPrimaryColor),