From dbc36390f3e00585f7867804aac478fe1972a7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Fri, 26 Apr 2024 20:52:38 +0300 Subject: [PATCH 1/2] ui: Improve remove strings Change the 'Remove from library' strings to 'Permanently delete' to make the action clearer for the user, informing them that the action will delete user files and cannot be recovered. Fixes #912 --- cozy/ui/delete_book_view.py | 6 +++--- cozy/ui/widgets/book_element.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cozy/ui/delete_book_view.py b/cozy/ui/delete_book_view.py index e0ba98c5..151e7091 100644 --- a/cozy/ui/delete_book_view.py +++ b/cozy/ui/delete_book_view.py @@ -10,14 +10,14 @@ class DeleteBookView(Adw.AlertDialog): def __init__(self, callback, book: Book): super().__init__( - heading=_("Delete Audiobook?"), - body=_("The audiobook will be removed from your disk and from Cozy's library."), + heading=_("Permanently Delete Audiobook?"), + body=_("The audiobook will be permanently deleted from your device and cannot be recovered"), default_response="cancel", close_response="cancel", ) self.add_response("cancel", _("Cancel")) - self.add_response("delete", _("Remove Audiobook")) + self.add_response("delete", _("Delete")) self.set_response_appearance("delete", Adw.ResponseAppearance.DESTRUCTIVE) list_box = Gtk.ListBox(margin_top=12, css_classes=["boxed-list"]) diff --git a/cozy/ui/widgets/book_element.py b/cozy/ui/widgets/book_element.py index 0d6c13e0..07b2f71b 100644 --- a/cozy/ui/widgets/book_element.py +++ b/cozy/ui/widgets/book_element.py @@ -73,7 +73,7 @@ def _create_context_menu(self): menu_model.append(_("Open in file browser"), "book_element.jump_to_folder") self.install_action("book_element.remove_book", None, self._remove_book) - menu_model.append(_("Remove from library"), "book_element.remove_book") + menu_model.append(_("Permanently Delete…"), "book_element.remove_book") menu = Gtk.PopoverMenu(menu_model=menu_model, has_arrow=False) menu.set_parent(self.art) From 09780a62e1916a9604456a1f177adf12e60026a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sabri=20=C3=9Cnal?= Date: Sat, 27 Apr 2024 17:09:59 +0300 Subject: [PATCH 2/2] ui: Make some strings GNOME HIG compatible Use header capitalization for menu entries and titles. More information: https://developer.gnome.org/hig/guidelines/writing-style.html --- cozy/ui/file_not_found_dialog.py | 2 +- cozy/ui/widgets/book_element.py | 4 ++-- data/ui/main_window.blp | 2 +- data/ui/preferences.blp | 2 +- data/ui/search_page.blp | 4 ++-- data/ui/storage_locations.blp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cozy/ui/file_not_found_dialog.py b/cozy/ui/file_not_found_dialog.py index 0f4192fb..f11ec2ee 100644 --- a/cozy/ui/file_not_found_dialog.py +++ b/cozy/ui/file_not_found_dialog.py @@ -15,7 +15,7 @@ def __init__(self, chapter: Chapter): self.missing_chapter = chapter super().__init__( - heading=_("File not found"), + heading=_("File Not Found"), body=_("This file could not be found. Do you want to locate it manually?"), default_response="locate", close_response="cancel", diff --git a/cozy/ui/widgets/book_element.py b/cozy/ui/widgets/book_element.py index 07b2f71b..57c5a1db 100644 --- a/cozy/ui/widgets/book_element.py +++ b/cozy/ui/widgets/book_element.py @@ -67,10 +67,10 @@ def _create_context_menu(self): menu_model = Gio.Menu() self.install_action("book_element.mark_as_read", None, self._mark_as_read) - menu_model.append(_("Mark as read"), "book_element.mark_as_read") + menu_model.append(_("Mark as Read"), "book_element.mark_as_read") self.install_action("book_element.jump_to_folder", None, self._jump_to_folder) - menu_model.append(_("Open in file browser"), "book_element.jump_to_folder") + menu_model.append(_("Open in File Browser"), "book_element.jump_to_folder") self.install_action("book_element.remove_book", None, self._remove_book) menu_model.append(_("Permanently Delete…"), "book_element.remove_book") diff --git a/data/ui/main_window.blp b/data/ui/main_window.blp index 4a96dc38..be97a34c 100644 --- a/data/ui/main_window.blp +++ b/data/ui/main_window.blp @@ -193,7 +193,7 @@ Adw.ApplicationWindow app_window { } Adw.NavigationPage { - title: _("Book title"); + title: _("Book Title"); tag: 'book_overview'; child: Adw.ToolbarView book_details_container {}; diff --git a/data/ui/preferences.blp b/data/ui/preferences.blp index 37c9e126..f815b48e 100644 --- a/data/ui/preferences.blp +++ b/data/ui/preferences.blp @@ -108,7 +108,7 @@ template $PreferencesWindow: Adw.PreferencesDialog { title: _("Feedback"); Adw.PreferencesGroup user_feedback_preference_group { - title: _("User feedback"); + title: _("User Feedback"); } } } diff --git a/data/ui/search_page.blp b/data/ui/search_page.blp index b043e990..7e2e3947 100644 --- a/data/ui/search_page.blp +++ b/data/ui/search_page.blp @@ -4,12 +4,12 @@ using Adw 1; template $SearchView: Adw.Bin { Stack stack { Adw.StatusPage start_searching_page { - title: _("Search in your library"); + title: _("Search in Your Library"); icon-name: 'library-symbolic'; } Adw.StatusPage nothing_found_page { - title: _("No results found"); + title: _("No Results Found"); icon-name: 'edit-find-symbolic'; } diff --git a/data/ui/storage_locations.blp b/data/ui/storage_locations.blp index 2b59a738..ac283426 100644 --- a/data/ui/storage_locations.blp +++ b/data/ui/storage_locations.blp @@ -2,7 +2,7 @@ using Gtk 4.0; using Adw 1; template $StorageLocations: Adw.PreferencesGroup { - title: _("Storage locations"); + title: _("Storage Locations"); ListBox storage_locations_list { margin-bottom: 18;