improved localizations

lib/locale/l10n/app_de.arb

@@ -4,6 +4,8 @@
   "generalError": "Ein Fehler ist aufgetreten",
   "generalCancelButtonLabel": "Abbrechen",
   "generalContinueButtonLabel": "Weiter",
+  "generalUnderstoodButtonLabel": "OK",
+  "generalLoadingLabel": "Wird geladen...",
 
   "welcomeScreenDescription": "Finde heraus was du den ganzen Tag gemacht hast und erlebe Erinnerungen wieder, die du komplett vergessen hast!",
   "welcomeScreenSubtitle": "Was hab ich heute gemacht?",
@@ -11,15 +13,13 @@
   "welcomeScreenCreateMemoriesGuideDescription": "Erstelle Fotos und Videos während des Tages auf...",
   "welcomeScreenViewMemoriesGuideDescription": "...und lebe deine Liebelingsmomente des Tages wieder!",
   "welcomeScreenGetStartedLabel": "Loslegen",
-  "welcomeScreenMemoriesDataMemoriesAmount": "Du hast {memoriesAmount} Erinnerungen erstellt",
-  "welcomeScreenMemoriesDataMemoriesSpanning": "Welche vom {startDateFormatted} bis zum {endDateFormatted} reichen",
+  "welcomeScreenMemoriesDataMemoriesAmount": "Du hast {count,plural, =0{noch keine Erinnerungen}} =1{eine Erinnerung} other{{count} Erinnerungen}} erstellt",
+  "welcomeScreenMemoriesDataMemoriesSpanning": "Welche vom {startDate} bis zum {endDate} reichen",
 
 
   "serverLoadingScreenDescription": "Wir laden deine Daten",
 
 
-  "mainScreenLoadingCamera": "Kamera wird geladen",
-
   "mainScreenActionsTorchButton": "Taschenlampe",
   "mainScreenUploadSuccess": "Erfolgreich hochgeladen",
 
@@ -28,6 +28,10 @@
   "mainScreenTakeVideoActionSaveVideo": "Video wird aufgenommen, halte still...",
   "mainScreenTakeVideoActionUploadingVideo": "Video wird hochgeladen...",
 
+  "mainScreenHelpSheetTitle": "Nimm deine besten Momente im Leben auf",
+  "mainScreenHelpSheetTakePhotoExplanation": "Tippe einmal auf den Auslöser um ein Foto zu erstellen.",
+  "mainScreenHelpSheetTakeVideoExplanation": "Halt den Auslöser gedrückt um ein Video aufzunehmen. Lasse los, wenn du fertig bist.",
+
   "recordingOverlayIsRecording": "Aufnahme",
 
 
@@ -62,7 +66,7 @@
   "memorySheetUpdateMemoryMakePublic": "Veröffentlichen",
   "memorySheetUpdateMemoryMakePrivate": "Privat machen",
   "memorySheetDeleteMemory": "Erinnerung löschen",
-  "memorySheetCreatedAtDataKey": "Erstellt am: {creationTimeFormatted}",
+  "memorySheetCreatedAtDataKey": "Erstellt am: {creationTime}",
   "memorySheetViewMoreDetails": "Mehr Details",
 
 
@@ -70,7 +74,6 @@
   "memoryMapScreenExpandForMoreDescription": "Erweitere für mehr Details",
   "memoryMapScreenOpenNavigation": "Navigation öffnen",
   "memoryMapScreenValuesAddressLabel": "Geschätzte Adresse",
-  "memoryMapScreenValuesAddressIsLoading": "Adresse wird geladen...",
   "memoryMapScreenValuesAddressIsUnavailable": "Address nicht verfügbar",
   "memoryMapScreenValuesLatitudeLabel": "Latitude",
   "memoryMapScreenValuesLongitudeLabel": "Longitude",
@@ -88,7 +91,6 @@
   "emptyScreenCreateMemory": "Erinnerung erstellen",
 
 
-  "settingsScreenLoading": "Einstellungen werden geladen...",
   "settingsScreenTitle": "Einstellungen",
   "settingsScreenAccountSectionTitle": "Dein Account",
   "settingsScreenAccountSectionCreationDateLabel": "Account-Erstellung",
@@ -99,12 +101,21 @@
   "settingsScreenDeleteAccountConfirmLabel": "Account jetzt löschen",
   "settingsScreenGeneralSectionTitle": "General",
   "settingsScreenGeneralSectionQualityLabel": "Qualität",
+  "settingsScreenResetHelpSheetsLabel": "Hilf-Sheets zurücksetzen",
+  "settingsScreenResetHelpSheetsResetSuccessfully": "Hilf-Sheets wurden zurückgesetzt.",
 
 
   "calendarScreenTitle": "Kalendar",
 
 
   "timelineScreenTitle": "Timeline",
+  "timelineScreenHelpSheetTitle": "Willkommen zu deiner Timeline",
+  "timelineHelpContentDescription": "Deine Erfahrungen werden in chronologischer Reihenfolge präsentiert. Du kannst nach links oder rechts wischen um durch deine Erinnerungen von deinem aktuellen Tag zu gehen. Du kannst auch nach oben und unten wischen um durch die verschiedenen Tage deiner Erinnerungen zu gehen. Deine Timeline springt automatisch zur nächsten Erinnerung nach einiger Zeit.",
+  "timelineHelpContentHoldDownExplanation": "Halte gedrückt um deine Timeline zu pausieren.",
+  "timelineHelpContentTapTwiceExplanation": "Tippe zweimal um mehr Details über deine Erinnerung zu erfahren,",
+
+
+  "helpSheetDontShowAgain": "Nicht mehr anzeigen",
 
 
   "enumMapping_ResolutionPreset_low": "Niedrig",

lib/locale/l10n/app_en.arb

@@ -5,6 +5,7 @@
   "generalCancelButtonLabel": "Cancel",
   "generalContinueButtonLabel": "Continue",
   "generalUnderstoodButtonLabel": "OK",
+  "generalLoadingLabel": "Loading...",
 
   "welcomeScreenDescription": "Find out what you did all the days and unlock moments you completely forgot!",
   "welcomeScreenSubtitle": "What did I do today?",
@@ -13,22 +14,24 @@
   "welcomeScreenViewMemoriesGuideDescription": "...and relieve your best moments at the end of the day!",
   "welcomeScreenGetStartedLabel": "Get started",
 
-  "welcomeScreenMemoriesDataMemoriesAmount": "You have created {memoriesAmount} memories",
+  "welcomeScreenMemoriesDataMemoriesAmount": "You have created {count,plural, =0{no memories yet}} =1{one memory} other{{count} memories}}",
   "@welcomeScreenMemoriesDataMemoriesAmount": {
     "placeholders": {
-      "memoriesAmount": {
+      "count": {
         "type": "int"
       }
     }
   },
-  "welcomeScreenMemoriesDataMemoriesSpanning": "Spanning from {startDateFormatted} to {endDateFormatted}",
+  "welcomeScreenMemoriesDataMemoriesSpanning": "Spanning from {startDate} to {endDate}",
   "@welcomeScreenMemoriesDataMemoriesSpanning": {
     "placeholders": {
-      "startDateFormatted": {
-        "type": "String"
+      "startDate": {
+        "type": "DateTime",
+        "format": "yMMMd"
       },
-      "endDateFormatted": {
-        "type": "String"
+      "endDate": {
+        "type": "DateTime",
+        "format": "yMMMd"
       }
     }
   },
@@ -37,8 +40,6 @@
   "serverLoadingScreenDescription": "We are loading your data",
 
 
-  "mainScreenLoadingCamera": "Loading camera",
-
   "mainScreenActionsTorchButton": "Torch",
   "mainScreenUploadSuccess": "Uploaded successfully!",
 
@@ -85,13 +86,13 @@
   "memorySheetUpdateMemoryMakePublic": "Make Public",
   "memorySheetUpdateMemoryMakePrivate": "Make Private",
   "memorySheetDeleteMemory": "Delete Memory",
-  "memorySheetCreatedAtDataKey": "Created at: {creationTimeFormatted}",
+  "memorySheetCreatedAtDataKey": "Created at: {creationTime}",
   "@memorySheetCreatedAtDataKey": {
     "description": "Formatted date when the memory was created",
     "placeholders": {
-      "creationTimeFormatted": {
-        "type": "String",
-        "example": "8am"
+      "creationTime": {
+        "type": "DateTime",
+        "format": "jms"
       }
     }
   },
@@ -102,7 +103,6 @@
   "memoryMapScreenExpandForMoreDescription": "Expand for more details",
   "memoryMapScreenOpenNavigation": "Open Navigation",
   "memoryMapScreenValuesAddressLabel": "Estimated Address",
-  "memoryMapScreenValuesAddressIsLoading": "Loading address...",
   "memoryMapScreenValuesAddressIsUnavailable": "Address not available",
   "memoryMapScreenValuesLatitudeLabel": "Latitude",
   "memoryMapScreenValuesLongitudeLabel": "Longitude",
@@ -141,7 +141,6 @@
   "emptyScreenCreateMemory": "Create a Memory",
 
 
-  "settingsScreenLoading": "Loading Settings...",
   "settingsScreenTitle": "Settings",
   "settingsScreenAccountSectionTitle": "Your Account",
   "settingsScreenAccountSectionCreationDateLabel": "Account creation",
@@ -161,8 +160,8 @@
 
   "timelineScreenTitle": "Timeline",
   "timelineScreenHelpSheetTitle": "Welcome to your timeline",
-  "timelineHelpContentDescription": "Your memories are displayed in chronological order. You can swipe left or right to navigate through the memories of the given day. You can also swipe up or down to navigate through the days of your memories. The timeline automatically progresses through your memories.",
-  "timelineHelpContentHoldDownExplanation": "Hold down to pause the timeline from progressing to your next memory.",
+  "timelineHelpContentDescription": "Your memories are presented in chronological order. You can swipe left or right to navigate through the memories of the current day. You can also swipe up or down to navigate through the days of your memories. Your timeline automatically jumps to your next memory after some time.",
+  "timelineHelpContentHoldDownExplanation": "Hold down to pause your timeline.",
   "timelineHelpContentTapTwiceExplanation": "Tap twice to see more details about your memory.",
 
 

lib/screens/calendar_screen/memories_data.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:quid_faciam_hodie/constants/spacing.dart';
 import 'package:quid_faciam_hodie/models/memories.dart';
@@ -28,8 +27,8 @@ class MemoriesData extends StatelessWidget {
             const SizedBox(height: SMALL_SPACE),
             Text(
               localizations.welcomeScreenMemoriesDataMemoriesSpanning(
-                DateFormat.yMMMd().format(memories.memories.last.creationDate),
-                DateFormat.yMMMd().format(memories.memories.first.creationDate),
+                memories.memories.last.creationDate,
+                memories.memories.first.creationDate,
               ),
               style: getBodyTextTextStyle(context),
             ),

lib/screens/main_screen.dart

@@ -323,7 +323,7 @@ class _MainScreenState extends AuthRequiredState<MainScreen> with Loadable {
                   PlatformCircularProgressIndicator(),
                   const SizedBox(height: MEDIUM_SPACE),
                   Text(
-                    localizations.mainScreenLoadingCamera,
+                    localizations.generalLoadingLabel,
                     style: platformThemeData(
                       context,
                       material: (data) => data.textTheme.bodyText1,

lib/screens/memory_map_screen.dart

@@ -106,7 +106,7 @@ class _MemoryMapScreenState extends State<MemoryMapScreen> with Loadable {
                 title: localizations.memoryMapScreenValuesAddressLabel,
                 value: () {
                   if (isLoading) {
-                    return localizations.memoryMapScreenValuesAddressIsLoading;
+                    return localizations.generalLoadingLabel;
                   }
 
                   if (address == null) {

lib/screens/settings_screen.dart

@@ -138,7 +138,7 @@ class _SettingsScreenState extends AuthRequiredState<SettingsScreen>
                 children: <Widget>[
                   PlatformCircularProgressIndicator(),
                   const SizedBox(height: MEDIUM_SPACE),
-                  Text(localizations.settingsScreenLoading),
+                  Text(localizations.generalLoadingLabel),
                 ],
               ),
             )

lib/screens/timeline_screen/memory_sheet.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:gallery_saver/gallery_saver.dart';
-import 'package:intl/intl.dart';
 import 'package:quid_faciam_hodie/constants/spacing.dart';
 import 'package:quid_faciam_hodie/enums.dart';
 import 'package:quid_faciam_hodie/extensions/snackbar.dart';
@@ -236,9 +235,7 @@ class _MemorySheetState extends State<MemorySheet> with Loadable {
                   const SizedBox(width: TINY_SPACE),
                   Text(
                     localizations.memorySheetCreatedAtDataKey(
-                      DateFormat.jms().format(
-                        widget.memory.creationDate,
-                      ),
+                      widget.memory.creationDate,
                     ),
                     style: getBodyTextTextStyle(context),
                   ),