From 589874bec1ab6de11dfd2ff78c3713d4e0b409a7 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 3 Jul 2015 21:04:47 -0400 Subject: [PATCH] Simplify 'trash can' to just 'trash'. --- mayan/apps/documents/apps.py | 2 +- mayan/apps/documents/links.py | 4 ++-- mayan/apps/documents/models.py | 2 +- mayan/apps/documents/views.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py index bebe7db02b..b24e0d3aed 100644 --- a/mayan/apps/documents/apps.py +++ b/mayan/apps/documents/apps.py @@ -97,7 +97,7 @@ class DocumentsApp(MayanAppConfig): SourceColumn(source=Document, label=_('Thumbnail'), attribute=encapsulate(lambda document: document_thumbnail(document, gallery_name='documents:document_list', title=getattr(document, 'label', None), size=setting_thumbnail_size.value))) SourceColumn(source=Document, label=_('Type'), attribute='document_type') SourceColumn(source=DeletedDocument, label=_('Type'), attribute='document_type') - SourceColumn(source=DeletedDocument, label=_('Date time deleted'), attribute='deleted_date_time') + SourceColumn(source=DeletedDocument, label=_('Date time trashed'), attribute='deleted_date_time') menu_front_page.bind_links(links=[link_document_list_recent, link_document_list, link_document_list_deleted]) menu_setup.bind_links(links=[link_document_type_setup]) diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index b41658da79..9df9a91d33 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -67,7 +67,7 @@ link_document_version_download = Link(args='object.pk', permissions=[permission_ # Views link_document_list = Link(icon='fa fa-file', text=_('All documents'), view='documents:document_list') link_document_list_recent = Link(icon='fa fa-clock-o', text=_('Recent documents'), view='documents:document_list_recent') -link_document_list_deleted = Link(icon='fa fa-trash', text=_('Deleted documents'), view='documents:document_list_deleted') +link_document_list_deleted = Link(icon='fa fa-trash', text=_('Trash'), view='documents:document_list_deleted') # Tools link_clear_image_cache = Link( @@ -76,7 +76,7 @@ link_clear_image_cache = Link( permissions=[permission_document_tools], text=_('Clear image cache'), view='documents:document_clear_image_cache' ) -link_trash_can_empty = Link(permissions=[permission_empty_trash], text=_('Empty trash can'), view='documents:trash_can_empty') +link_trash_can_empty = Link(permissions=[permission_empty_trash], text=_('Empty trash'), view='documents:trash_can_empty') # Document pages link_document_page_navigation_first = Link(conditional_disable=is_first_page, icon='fa fa-step-backward', keep_query=True, permissions=[permission_document_view], text=_('First page'), view='documents:document_page_navigation_first', args='resolved_object.pk') diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index 1891bd5d45..dd21d4eed8 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -82,7 +82,7 @@ class Document(models.Model): date_added = models.DateTimeField(verbose_name=_('Added'), auto_now_add=True) language = models.CharField(choices=setting_language_choices.value, default=setting_language.value, max_length=8, verbose_name=_('Language')) in_trash = models.BooleanField(default=False, editable=False, verbose_name=_('In trash?')) - deleted_date_time = models.DateTimeField(blank=True, editable=True, verbose_name=_('Date and time deleted')) + deleted_date_time = models.DateTimeField(blank=True, editable=True, verbose_name=_('Date and time trashed')) objects = DocumentManager() passthrough = PassthroughManager() diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index f047abaedd..8b4eec2ce7 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -84,7 +84,7 @@ class DeletedDocumentListView(DocumentListView): extra_context = { 'hide_link': True, - 'title': _('Deleted documents'), + 'title': _('Documents in trash'), } def get_document_queryset(self): @@ -183,7 +183,7 @@ class DocumentPageListView(ParentChildListView): class EmptyTrashCanView(ConfirmView): extra_context = { - 'title': _('Empty trash can?') + 'title': _('Empty trash?') } view_permission = permission_empty_trash action_cancel_redirect = post_action_redirect = reverse_lazy('documents:document_list_deleted') @@ -192,7 +192,7 @@ class EmptyTrashCanView(ConfirmView): for deleted_document in DeletedDocument.objects.all(): deleted_document.delete() - messages.success(request, _('Trash can emptied successfully')) + messages.success(request, _('Trash emptied successfully')) return HttpResponseRedirect(self.get_success_url())