fix: #2773 - appropriate "clear?" and "delete?" messages for user lis…

…ts (#2778) Impacted files: * `app_en.arb`: labels for user lists (clear? + delete?) * `app_fr.arb`: labels for user lists (clear? + delete?) * `product_list_page.dart`: now using the new "clear?" label for user lists * `product_list_user_dialog_helper.dart`: now localizing with the new "delete?" label for user lists
openfoodfacts · Aug 16, 2022 · 3deb4cb · 3deb4cb
1 parent d922511
commit 3deb4cb
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 7 deletions.
diff --git a/packages/smooth_app/lib/l10n/app_en.arb b/packages/smooth_app/lib/l10n/app_en.arb
@@ -1476,9 +1476,27 @@
     "@basic_details_add_error": {
         "description": "Error message when error occurs while submitting basic details"
     },
-    "confirm_clear": "You're about to delete your entire history, are you sure you want to continue?",
+    "confirm_clear": "You're about to clear your entire history: are you sure you want to continue?",
     "@confirm_clear": {
-        "description": "Asking about whether to clear the list or not"
+        "description": "Asking about whether to clear the history list or not"
+    },
+    "confirm_clear_user_list": "You're about to clear this list ({name}): are you sure you want to continue?",
+    "@confirm_clear_user_list": {
+        "description": "Asking about whether to clear the list or not",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "confirm_delete_user_list": "You're about to delete this list ({name}): are you sure you want to continue?",
+    "@confirm_delete_user_list": {
+        "description": "Asking about whether to delete the list or not",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
     },
     "importance_label": "{name} importance: {id}",
     "@importance_label": {

diff --git a/packages/smooth_app/lib/l10n/app_fr.arb b/packages/smooth_app/lib/l10n/app_fr.arb
@@ -1474,9 +1474,27 @@
     "@basic_details_add_error": {
         "description": "Error message when error occurs while submitting basic details"
     },
-    "confirm_clear": "Vous êtes sur le point de supprimer tout votre historique, êtes-vous sûr de vouloir continuer ?",
+    "confirm_clear": "Vous êtes sur le point d'effacer votre historique : êtes-vous sûr de vouloir continuer ?",
     "@confirm_clear": {
-        "description": "Asking about whether to clear the list or not"
+        "description": "Asking about whether to clear the history list or not"
+    },
+    "confirm_clear_user_list": "Vous êtes sur le point de vider cette liste ({name}) : êtes-vous sûr de vouloir continuer ?",
+    "@confirm_clear_user_list": {
+        "description": "Asking about whether to clear the list or not",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
+    },
+    "confirm_delete_user_list": "Vous êtes sur le point de supprimer cette liste ({name}) : êtes-vous sûr de vouloir continuer ?",
+    "@confirm_delete_user_list": {
+        "description": "Asking about whether to delete the list or not",
+        "placeholders": {
+            "name": {
+                "type": "String"
+            }
+        }
     },
     "importance_label": "{name} importance : {id}",
     "@importance_label": {

diff --git a/packages/smooth_app/lib/pages/product/common/product_list_page.dart b/packages/smooth_app/lib/pages/product/common/product_list_page.dart
@@ -98,7 +98,12 @@ class _ProductListPageState extends State<ProductListPage>
                           context: context,
                           builder: (BuildContext context) {
                             return SmoothAlertDialog(
-                              body: Text(appLocalizations.confirm_clear),
+                              body: Text(
+                                productList.listType == ProductListType.USER
+                                    ? appLocalizations.confirm_clear_user_list(
+                                        productList.parameters)
+                                    : appLocalizations.confirm_clear,
+                              ),
                               positiveAction: SmoothActionButton(
                                 onPressed: () async {
                                   await daoProductList.clear(productList);

diff --git a/packages/smooth_app/lib/pages/product_list_user_dialog_helper.dart b/packages/smooth_app/lib/pages/product_list_user_dialog_helper.dart
@@ -224,8 +224,9 @@ class ProductListUserDialogHelper {
     final bool? deleted = await showDialog<bool>(
       context: context,
       builder: (final BuildContext context) => SmoothAlertDialog(
-        title: 'Delete list?',
-        body: Text(productList.parameters),
+        body: Text(
+          appLocalizations.confirm_delete_user_list(productList.parameters),
+        ),
         negativeAction: SmoothActionButton(
           onPressed: () => Navigator.pop(context),
           text: appLocalizations.cancel,