From 1a6174bcd406951c69cde87f8649ee9c79ce70e1 Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Fri, 19 Aug 2022 12:11:26 +0200 Subject: [PATCH] improved localizations --- lib/locale/l10n/app_de.arb | 15 ++++++++++++--- lib/locale/l10n/app_en.arb | 7 ++++++- lib/screens/calendar_screen.dart | 4 +++- lib/screens/main_screen.dart | 2 +- lib/screens/timeline_screen.dart | 5 ++++- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/lib/locale/l10n/app_de.arb b/lib/locale/l10n/app_de.arb index 3b22c36..05dd05b 100644 --- a/lib/locale/l10n/app_de.arb +++ b/lib/locale/l10n/app_de.arb @@ -62,6 +62,7 @@ "memorySheetUpdateMemoryMakePublic": "Veröffentlichen", "memorySheetUpdateMemoryMakePrivate": "Privat machen", "memorySheetDeleteMemory": "Erinnerung löschen", + "memorySheetCreatedAtDataKey": "Erstellt am: {creationTimeFormatted}", "memorySheetViewMoreDetails": "Mehr Details", @@ -74,15 +75,17 @@ "memoryMapScreenValuesLatitudeLabel": "Latitude", "memoryMapScreenValuesLongitudeLabel": "Longitude", "memoryMapScreenValuesAltitudeLabel": "Höhe", + "memoryMapScreenValuesAltitudeValue": "{valueInMeter} m", "memoryMapScreenValuesAccuracyLabel": "Genauigkeit", + "memoryMapScreenValuesAccuracyValue": "{valueInMeter}m", "memoryMapScreenValuesSpeedLabel": "Geschwindigkeit", + "memoryMapScreenValuesSpeedValue": "{valueInKmh} km/h", "emptyScreenTitle": "Houston, wir haben ein Problem", "emptyScreenSubtitle": "Der Benutzer hat noch keine Erinnerungen erstellt!", - "emptyScreenDescription": "Um deinen Zeitstrahl sehen zu können musst du zuerst ein paar Erinnerungen erstellen! :)", + "emptyScreenDescription": "Um deine Timeline sehen zu können musst du zuerst ein paar Erinnerungen erstellen! :)", "emptyScreenCreateMemory": "Erinnerung erstellen", - "memorySheetCreatedAtDataKey": "Erstellt am: {creationTimeFormatted}", "settingsScreenLoading": "Einstellungen werden geladen...", @@ -95,7 +98,13 @@ "settingsScreenDeleteAccountDescription": "Bist du dir sicher, dass du deinen Account löschen möchtest? Diese Aktion kann nicht rückgangig gemacht werden! Deine Erfahrungen werden ebenfalls gelöscht.", "settingsScreenDeleteAccountConfirmLabel": "Account jetzt löschen", "settingsScreenGeneralSectionTitle": "General", - "settingsScreenGeneralSectionQualityLabel": "Quality", + "settingsScreenGeneralSectionQualityLabel": "Qualität", + + + "calendarScreenTitle": "Kalendar", + + + "timelineScreenTitle": "Timeline", "enumMapping_ResolutionPreset_low": "Niedrig", diff --git a/lib/locale/l10n/app_en.arb b/lib/locale/l10n/app_en.arb index af54319..6b7b278 100644 --- a/lib/locale/l10n/app_en.arb +++ b/lib/locale/l10n/app_en.arb @@ -90,7 +90,6 @@ } } }, - "memorySheetMapEstimatedAddressLabel": "Estimated Address", "memorySheetViewMoreDetails": "View More Details", @@ -150,6 +149,12 @@ "settingsScreenGeneralSectionQualityLabel": "Quality", + "calendarScreenTitle": "Calendar", + + + "timelineScreenTitle": "Timeline", + + "enumMapping_ResolutionPreset_low": "Low", "enumMapping_ResolutionPreset_medium": "Medium", "enumMapping_ResolutionPreset_high": "High", diff --git a/lib/screens/calendar_screen.dart b/lib/screens/calendar_screen.dart index 3317e22..63d01a3 100644 --- a/lib/screens/calendar_screen.dart +++ b/lib/screens/calendar_screen.dart @@ -1,4 +1,5 @@ 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:flutter_sticky_header/flutter_sticky_header.dart'; import 'package:provider/provider.dart'; @@ -19,6 +20,7 @@ class CalendarScreen extends StatelessWidget { @override Widget build(BuildContext context) { + final localizations = AppLocalizations.of(context)!; final memoriesManager = context.read(); final calendarManager = CalendarManager(memories: memoriesManager.memories); @@ -28,7 +30,7 @@ class CalendarScreen extends StatelessWidget { builder: (context, memories, _) => PlatformScaffold( appBar: isCupertino(context) ? PlatformAppBar( - title: const Text('Calendar'), + title: Text(localizations.calendarScreenTitle), ) : null, body: Padding( diff --git a/lib/screens/main_screen.dart b/lib/screens/main_screen.dart index d97e309..a0988b1 100644 --- a/lib/screens/main_screen.dart +++ b/lib/screens/main_screen.dart @@ -525,7 +525,7 @@ class _MainScreenState extends AuthRequiredState with Loadable { }); }, child: zoomLevels == null - ? const Text('1x') + ? Text(formatZoomLevel(1.0)) : Text( formatZoomLevel(currentZoomLevel), ), diff --git a/lib/screens/timeline_screen.dart b/lib/screens/timeline_screen.dart index 4b19679..e4030b7 100644 --- a/lib/screens/timeline_screen.dart +++ b/lib/screens/timeline_screen.dart @@ -6,6 +6,7 @@ import 'package:quid_faciam_hodie/models/memories.dart'; import 'package:quid_faciam_hodie/models/timeline.dart'; import 'package:quid_faciam_hodie/utils/loadable.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'calendar_screen.dart'; import 'empty_screen.dart'; @@ -98,6 +99,8 @@ class _TimelineScreenState extends State with Loadable { @override Widget build(BuildContext context) { + final localizations = AppLocalizations.of(context)!; + return WillPopScope( onWillPop: () async { if (widget.popToCalendarScreen) { @@ -111,7 +114,7 @@ class _TimelineScreenState extends State with Loadable { child: PlatformScaffold( appBar: isCupertino(context) ? PlatformAppBar( - title: Text('Timeline'), + title: Text(localizations.timelineScreenTitle), ) : null, body: ChangeNotifierProvider.value(