Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix trash permanent delete dialog #7805

Merged
merged 4 commits into from
Mar 12, 2024
Merged

Fix trash permanent delete dialog #7805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36a1805
Fix Outdated Info for Deletion
NicholasFlamy Mar 10, 2024
bb88662
Merge branch 'immich-app:main' into fix-trash-permanent-delete-dialog
NicholasFlamy Mar 10, 2024
831bae0
Undo Flutter Updating Dependencies
NicholasFlamy Mar 10, 2024
a91d85e
Merge branch 'fix-trash-permanent-delete-dialog' of https://github.co…
NicholasFlamy Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions mobile/assets/i18n/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@
"daily_title_text_date": "E, MMM dd",
"daily_title_text_date_year": "E, MMM dd, yyyy",
"date_format": "E, LLL d, y • h:mm a",
"delete_dialog_alert": "These items will be permanently deleted from Immich and from your device",
"delete_dialog_alert_local": "These items will be permanently removed from your device but still be available on the Immich server",
"delete_dialog_alert_local_non_backed_up": "Some of the items aren't backed up to Immich and will be permanently removed from your device",
"delete_dialog_alert": "These items will be permanently deleted from the Immich server and from your device",
"delete_dialog_alert_local": "These items will be permanently deleted from your device but still be available on the Immich server",
"delete_dialog_alert_local_non_backed_up": "Some of the items aren't backed up to Immich and will be permanently deleted from your device",
"delete_dialog_alert_remote": "These items will be permanently deleted from the Immich server",
"delete_dialog_cancel": "Cancel",
"delete_dialog_ok": "Delete",
Expand Down Expand Up @@ -477,4 +477,4 @@
"viewer_remove_from_stack": "Remove from Stack",
"viewer_stack_use_as_main_asset": "Use as Main Asset",
"viewer_unstack": "Un-Stack"
}
}
10 changes: 5 additions & 5 deletions mobile/assets/i18n/ru-RU.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@
"daily_title_text_date": "E, MMM dd",
"daily_title_text_date_year": "E, MMM dd, yyyy",
"date_format": "E, LLL d, y • h:mm a",
"delete_dialog_alert": "Эти элементы будут безвозвратно удалены из приложения, а также с вашего устройства",
"delete_dialog_alert_local": "Эти объекты будут безвозвратно удалены с Вашего устройства, но по-прежнему будут доступны на сервере Immich",
"delete_dialog_alert_local_non_backed_up": "Резервные копии некоторых объектов не были загружены в Immich и будут безвозвратно удалены с Вашего устройства",
"delete_dialog_alert": "Эти объекты будут безвозвратно удалены с сервера Immich и вашего устройства.",
"delete_dialog_alert_local": "Эти объекты будут безвозвратно удалены с вашего устройства, но по-прежнему будут доступны на сервере Immich",
"delete_dialog_alert_local_non_backed_up": "Некоторые объекты не были скопированы на сервера Immich и будут безвозвратно удалены с вашего устройства",
"delete_dialog_alert_remote": "Эти объекты будут безвозвратно удалены с сервера Immich",
"delete_dialog_cancel": "Отменить",
"delete_dialog_ok": "Удалить",
Expand Down Expand Up @@ -457,7 +457,7 @@
"trash_page_empty_trash_btn": "Очистить корзину",
"trash_page_empty_trash_dialog_content": "Вы хотите очистить свою корзину? Эти объекты будут навсегда удалены из Immich.",
"trash_page_empty_trash_dialog_ok": "ОК",
"trash_page_info": "Удаленные элементы будут окончательно удалены через {} дней",
"trash_page_info": "Удаленные объекты будут окончательно удалены через {} дней",
"trash_page_no_assets": "Удаленные объекты отсутсвуют",
"trash_page_restore": "Восстановить",
"trash_page_restore_all": "Восстановить все",
Expand All @@ -477,4 +477,4 @@
"viewer_remove_from_stack": "Удалить из стека",
"viewer_stack_use_as_main_asset": "Использовать в качестве основного объекта",
"viewer_unstack": "Разобрать стек"
}
}
1 change: 1 addition & 0 deletions mobile/lib/modules/trash/views/trash_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ class TrashPage extends HookConsumerWidget {
await showDialog(
context: context,
builder: (context) => DeleteDialog(
alert: "delete_dialog_alert_remote",
onDelete: () => onPermanentlyDelete(),
),
);
Expand Down