Merge pull request #107 from Flajt/fix-missing-translations

Fix missing translations
Flajt · Dec 19, 2023 · 3195d3d · 3195d3d
2 parents 70d75a4 + d7a62be
commit 3195d3d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 14 deletions.
diff --git a/assets/translations/de.json b/assets/translations/de.json
@@ -4,7 +4,7 @@
             "imageVideo": "Bild/Video",
             "audio": "Audio",
             "verify": "Verifizieren",
-            "locationWarning": "Du hast Standort speicher aktiviert, aber den GPS Service deaktiviert!"
+            "locationWarning": "Du hast Standort einbetten aktiviert, aber den GPS Service deaktiviert!"
         }
     },
     "introPage": {

diff --git a/lib/features/metadata/uiblocks/EnableLocationWarning.dart b/lib/features/metadata/uiblocks/EnableLocationWarning.dart
@@ -27,7 +27,8 @@ class EnableLocationWarning extends StatelessWidget {
               border: Border.all(color: Colors.black), color: Colors.redAccent),
           child: Center(
               child: Text(
-            "homePage.locationWarning",
+            "homePage.options.locationWarning",
+            textAlign: TextAlign.center,
             style: Theme.of(context).textTheme.titleMedium,
           ).tr()),
         );

diff --git a/lib/features/metadata/uiblocks/LocationEmbeddingTile.dart b/lib/features/metadata/uiblocks/LocationEmbeddingTile.dart
@@ -20,7 +20,9 @@ class LocationEmbeddingTile extends StatelessWidget {
         title: const Text("settingsPage.embedLocation").tr(),
         subtitle: const Text("settingsPage.embedLocationSubtitle").tr(),
         trailing: Checkbox.adaptive(
-            value: service.shouldEmbedLocation(),
+            value: state is LocationEmbeddingPermissionModified
+                ? state.permission
+                : service.shouldEmbedLocation(),
             onChanged: (v) => context
                 .read<SettingsBloc>()
                 .add(ModifyLocationEmbeddingPermission(v ?? false))),

diff --git a/lib/features/settings/bloc/SettingsBloc.dart b/lib/features/settings/bloc/SettingsBloc.dart
@@ -58,19 +58,22 @@ class SettingsBloc extends Bloc<SettingsBlocEvents, SettingsBlocStates> {
             if (gotPermission) {
               await metaDataPermissionService
                   .allowLocationEmbedding(event.permission);
-              emit(LocationEmbeddingPermissionModified());
+              emit(LocationEmbeddingPermissionModified(
+                  permission: event.permission));
             } else {
               emit(ErrorState("Location Permission Denied!"));
             }
           } else {
             await metaDataPermissionService
                 .allowLocationEmbedding(event.permission);
-            emit(LocationEmbeddingPermissionModified());
+            emit(LocationEmbeddingPermissionModified(
+                permission: event.permission));
           }
         } else {
           await metaDataPermissionService
               .allowLocationEmbedding(event.permission);
-          emit(LocationEmbeddingPermissionModified());
+          emit(LocationEmbeddingPermissionModified(
+              permission: event.permission));
         }
       } catch (e, stackTrace) {
         addError(e, stackTrace);

diff --git a/lib/features/settings/bloc/SettingsBlocStates.dart b/lib/features/settings/bloc/SettingsBlocStates.dart
@@ -33,8 +33,10 @@ class SecretSavedState extends SettingsBlocStates {
 }
 
 class LocationEmbeddingPermissionModified extends SettingsBlocStates {
+  final bool permission;
+  LocationEmbeddingPermissionModified({required this.permission});
   @override
-  List<Object?> get props => [];
+  List<Object?> get props => [permission];
 }
 
 class SecretEmbeddingPermissionModified extends SettingsBlocStates {

diff --git a/lib/features/verification/uiblocks/CheckMarkTable.dart b/lib/features/verification/uiblocks/CheckMarkTable.dart
@@ -22,10 +22,10 @@ class CheckMarkTable extends StatelessWidget {
             title: "verificationPage.hashMatching".tr(),
             value: statusModel.matchingHashes),
         CheckMarkTile(
-            title: "verificationpage.signatureVerified".tr(),
+            title: "verificationPage.signatureVerified".tr(),
             value: statusModel.verifiedSignature),
         CheckMarkTile(
-            title: "verificationPagelocationStored".tr(),
+            title: "verificationPage.locationStored".tr(),
             value: statusModel.metaDataModel?.location != null)
       ]),
     );

diff --git a/test/metadata/uiblocks/EnableLocationWarning_test.dart b/test/metadata/uiblocks/EnableLocationWarning_test.dart
@@ -33,7 +33,7 @@ void main() {
               home: Scaffold(
                   body: EnableLocationWarning(width: 400, height: 200)))));
       await widgetTester.pumpAndSettle();
-      expect(find.text("homePage.locationWarning"), findsOneWidget);
+      expect(find.text("homePage.options.locationWarning"), findsOneWidget);
     });
 
     testWidgets("show container if location is enabled", (widgetTester) async {
@@ -51,7 +51,7 @@ void main() {
                   body: EnableLocationWarning(width: 200, height: 200)))));
       await widgetTester.pumpAndSettle();
 
-      expect(find.text("homePage.locationWarning"), findsNothing);
+      expect(find.text("homePage.options.locationWarning"), findsNothing);
     });
   });
 }
diff --git a/test/settings/bloc/SettingsBloc_test.dart b/test/settings/bloc/SettingsBloc_test.dart
@@ -74,7 +74,7 @@ void main() {
               .thenAnswer((realInvocation) => Future.value(true));
         },
         act: (bloc) => bloc.add(ModifyLocationEmbeddingPermission(true)),
-        expect: () => [LocationEmbeddingPermissionModified()],
+        expect: () => [LocationEmbeddingPermissionModified(permission: true)],
         build: () => SettingsBloc());
     blocTest("fail, location permission denied",
         setUp: () {
@@ -122,7 +122,7 @@ void main() {
               .thenAnswer((realInvocation) => Future.value(false));
         },
         act: (bloc) => bloc.add(ModifyLocationEmbeddingPermission(true)),
-        expect: () => [LocationEmbeddingPermissionModified()],
+        expect: () => [LocationEmbeddingPermissionModified(permission: true)],
         build: () => SettingsBloc());
     blocTest("disable successfully",
         setUp: () {
@@ -135,7 +135,7 @@ void main() {
               .thenAnswer((realInvocation) => Future.value());
         },
         act: (bloc) => bloc.add(ModifyLocationEmbeddingPermission(false)),
-        expect: () => [LocationEmbeddingPermissionModified()],
+        expect: () => [LocationEmbeddingPermissionModified(permission: false)],
         build: () => SettingsBloc());
   });
 }