matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #84, Remove template context variable 'object_name' to improve ease of translation

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-28 02:36:43 -04:00
parent 92d4d5e6bc
commit 2c2dfa88cc
14 changed files with 5 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mayan/apps/checkouts/views.py
View File

@@ -129,7 +129,6 @@ def checkin_document(request, document_pk):
return HttpResponseRedirect(next)
context = {
'object_name': _(u'Document'),
'delete_view': False,
'previous': previous,
'next': next,

5
mayan/apps/document_indexing/views.py
View File

@@ -100,7 +100,6 @@ def index_setup_edit(request, index_pk):
'title': _(u'Edit index: %s') % index,
'form': form,
'index': index,
'object_name': _(u'Index'),
'navigation_object_name': 'index',
}, context_instance=RequestContext(request))
@@ -130,7 +129,6 @@ def index_setup_delete(request, index_pk):
context = {
'index': index,
'object_name': _(u'Index'),
'navigation_object_name': 'index',
'delete_view': True,
'previous': previous,
@@ -155,7 +153,6 @@ def index_setup_view(request, index_pk):
context = {
'object_list': object_list,
'index': index,
'object_name': _(u'Index'),
'list_object_variable_name': 'node',
'navigation_object_name': 'index',
'title': _(u'Tree template nodes for index: %s') % index,
@@ -191,7 +188,6 @@ def index_setup_document_types(request, index_pk):
extra_context={
'navigation_object_name': 'index',
'index': index,
'object_name': _(u'Index'),
}
)
@@ -218,7 +214,6 @@ def template_node_create(request, parent_pk):
'title': _(u'Create child node'),
'form': form,
'index': parent_node.index,
'object_name': _(u'Index'),
'navigation_object_name': 'index',
}, context_instance=RequestContext(request))

6
mayan/apps/documents/views.py
View File

@@ -201,7 +201,6 @@ def document_delete(request, document_id=None, document_id_list=None):
return HttpResponseRedirect(next)
context = {
'object_name': _(u'document'),
'delete_view': True,
'previous': previous,
'next': next,
@@ -507,7 +506,6 @@ def document_clear_transformations(request, document_id=None, document_id_list=N
return HttpResponseRedirect(next)
context = {
'object_name': _(u'Document transformation'),
'delete_view': True,
'previous': previous,
'next': next,
@@ -882,7 +880,6 @@ def document_type_edit(request, document_type_id):
return render_to_response('main/generic_form.html', {
'title': _(u'Edit document type: %s') % document_type,
'form': form,
'object_name': _(u'Document type'),
'navigation_object_name': 'document_type',
'document_type': document_type,
'next': next
@@ -913,7 +910,6 @@ def document_type_delete(request, document_type_id):
'delete_view': True,
'navigation_object_name': 'document_type',
'next': next,
'object_name': _(u'Document type'),
'previous': previous,
'title': _(u'Are you sure you wish to delete the document type: %s?') % document_type,
'message': _(u'All documents of this type will be deleted too.'),
@@ -952,7 +948,6 @@ def document_type_filename_list(request, document_type_id):
context = {
'object_list': document_type.filenames.all(),
'title': _(u'filenames for document type: %s') % document_type,
'object_name': _(u'Document type'),
'navigation_object_name': 'document_type',
'document_type': document_type,
'list_object_variable_name': 'filename',
@@ -1024,7 +1019,6 @@ def document_type_filename_delete(request, document_type_filename_id):
return HttpResponseRedirect(next)
context = {
'object_name': _(u'Document type filename'),
'delete_view': True,
'previous': previous,
'next': next,

5
mayan/apps/folders/views.py
View File

@@ -86,7 +86,6 @@ def folder_edit(request, folder_id):
'title': _(u'Edit folder: %s') % folder,
'form': form,
'object': folder,
'object_name': _(u'Folder'),
}, context_instance=RequestContext(request))
@@ -114,7 +113,6 @@ def folder_delete(request, folder_id):
return HttpResponseRedirect(next)
context = {
'object_name': _(u'Folder'),
'delete_view': True,
'previous': previous,
'next': next,
@@ -145,7 +143,6 @@ class FolderDetailView(DocumentListView):
'title': _(u'Documents in folder: %s') % self.get_folder(),
'hide_links': True,
'object': self.get_folder(),
'object_name': _(u'Folder'),
}
@@ -186,7 +183,6 @@ def folder_add_document(request, document_id=None, document_id_list=None):
form = FolderListForm(user=request.user)
context = {
'object_name': _(u'Document'),
'form': form,
'previous': previous,
'next': next,
@@ -265,7 +261,6 @@ def folder_document_remove(request, folder_id, document_id=None, document_id_lis
return HttpResponseRedirect(next)
context = {
'object_name': _(u'Folder document'),
'previous': previous,
'next': next,
'object': folder

6
mayan/apps/main/templates/main/base.html
View File

@@ -318,11 +318,7 @@
{% if object_navigation_links %}
<div class="block">
{% if navigation_object %}
{% if object_name %}
<h3>{% blocktrans %}Actions for {{ object_name }}: {{ navigation_object }}{% endblocktrans %}</h3>
{% else %}
<h3>{% blocktrans %}Actions for: {{ navigation_object }}{% endblocktrans %}</h3>
{% endif %}
<h3>{% blocktrans %}Actions for: {{ navigation_object }}{% endblocktrans %}</h3>
{% else %}
<h3>{% trans 'Actions' %}</h3>
{% endif %}

18
mayan/apps/main/templates/main/calculate_form_title.html
View File

@@ -4,24 +4,12 @@
{{ title }}
{% else %}
{% if read_only %}
{% if object_name %}
{% blocktrans %}Details for {{ object_name }}: {{ object }}{% endblocktrans %}
{% else %}
{% blocktrans %}Details for: {{ object }}{% endblocktrans %}
{% endif %}
{% blocktrans %}Details for: {{ object }}{% endblocktrans %}
{% else %}
{% if object %}
{% if object_name %}
{% blocktrans with object as object and object_name as object_name %}Edit {{ object_name }}: {{ object }}{% endblocktrans %}
{% else %}
{% blocktrans with object as object %}Edit: {{ object }}{% endblocktrans %}
{% endif %}
{% blocktrans with object as object %}Edit: {{ object }}{% endblocktrans %}
{% else %}
{% if object_name %}
{% blocktrans %}Create new {{ object_name }}{% endblocktrans %}
{% else %}
{% trans 'Create' %}
{% endif %}
{% trans 'Create' %}
{% endif %}
{% endif %}
{% endif %}

6
mayan/apps/main/templates/main/generic_confirm.html
View File

@@ -38,11 +38,7 @@
<h3>{{ title }}</h3>
{% else %}
{% if delete_view %}
{% if object_name %}
<h3>{% blocktrans %}Are you sure you wish to delete {{ object_name }}: {{ object }}?{% endblocktrans %}</h3>
{% else %}
<h3>{% blocktrans %}Are you sure you wish to delete: {{ object }}?{% endblocktrans %}</h3>
{% endif %}
<h3>{% blocktrans %}Are you sure you wish to delete: {{ object }}?{% endblocktrans %}</h3>
{% endif %}
{% endif %}
<h4>{{ message }}</h4>

3
mayan/apps/metadata/views.py
View File

@@ -172,7 +172,6 @@ def setup_metadata_type_edit(request, metadatatype_id):
'title': _(u'Edit metadata type: %s') % metadata_type,
'form': form,
'object': metadata_type,
'object_name': _(u'Metadata type'),
}, context_instance=RequestContext(request))
@@ -215,7 +214,6 @@ def setup_metadata_type_delete(request, metadatatype_id):
return HttpResponseRedirect(next)
context = {
'object_name': _(u'Metadata type'),
'delete_view': True,
'next': next,
'previous': previous,
@@ -285,7 +283,6 @@ def setup_document_type_metadata(request, document_type_id):
extra_context={
'document_type': document_type,
'navigation_object_name': 'document_type',
'object_name': _(u'Document type'),
},
grouped=True,
)

1
mayan/apps/ocr/views.py
View File

@@ -31,7 +31,6 @@ def queue_document_list(request, queue_name='default'):
'title': _(u'Documents in queue: %s') % document_queue,
'hide_object': True,
'queue': document_queue,
'object_name': _(u'Document queue'),
'navigation_object_name': 'queue',
'list_object_variable_name': 'queue_document',
'extra_columns': [

7
mayan/apps/permissions/views.py
View File

@@ -31,7 +31,6 @@ from .permissions import (PERMISSION_PERMISSION_GRANT,
class RoleCreateView(SingleObjectCreateView):
extra_context = {'object_name': _(u'Role')}
form_class = RoleForm
model = Role
permissions_required = [PERMISSION_ROLE_CREATE]
@@ -41,14 +40,10 @@ class RoleCreateView(SingleObjectCreateView):
class RoleDeleteView(SingleObjectDeleteView):
model = Role
permissions_required = [PERMISSION_ROLE_DELETE]
extra_context = {
'object_name': _(u'Role'),
}
success_url = reverse_lazy('permissions:role_list')
class RoleEditView(SingleObjectEditView):
extra_context = {'object_name': _(u'Role')}
model = Role
permissions_required = [PERMISSION_ROLE_EDIT]
@@ -95,7 +90,6 @@ def role_permissions(request, role_id):
return render_to_response('main/generic_detail.html', {
'form': form,
'object': role,
'object_name': _(u'Role'),
'subtemplates_list': subtemplates_list,
'multi_select_item_properties': {
'permission_id': lambda x: x.pk,
@@ -310,7 +304,6 @@ def role_members(request, role_id):
right_list_title=_(u'Members of role: %s') % role,
extra_context={
'object': role,
'object_name': _(u'Role'),
},
grouped=True,
)

4
mayan/apps/sources/views.py
View File

@@ -431,7 +431,6 @@ def setup_source_edit(request, source_id):
'source': source,
'navigation_object_name': 'source',
'next': next,
'object_name': _(u'Source'),
'source_type': source.source_type,
}, context_instance=RequestContext(request))
@@ -456,7 +455,6 @@ def setup_source_delete(request, source_id):
context = {
'title': _(u'Are you sure you wish to delete the source: %s?') % source,
'source': source,
'object_name': _(u'Source'),
'navigation_object_name': 'source',
'delete_view': True,
'previous': previous,
@@ -502,7 +500,6 @@ def setup_source_transformation_list(request, source_id):
'object_list': SourceTransformation.transformations.get_for_object(source),
'title': _(u'Transformations for: %s') % source.fullname(),
'source': source,
'object_name': _(u'Source'),
'navigation_object_name': 'source',
'list_object_variable_name': 'transformation',
'extra_columns': [
@@ -606,7 +603,6 @@ def setup_source_transformation_create(request, source_id):
return render_to_response('main/generic_form.html', {
'form': form,
'source': source,
'object_name': _(u'Source'),
'navigation_object_name': 'source',
'title': _(u'Create new transformation for source: %s') % source,
}, context_instance=RequestContext(request))

1
mayan/apps/statistics/views.py
View File

@@ -32,7 +32,6 @@ def namespace_details(request, namespace_id):
'object_list': namespace.statistics,
'hide_link': True,
'title': _(u'Namespace details for: %s') % namespace,
'object_name': _(u'Namespace'),
}, context_instance=RequestContext(request))

4
mayan/apps/tags/views.py
View File

@@ -88,7 +88,6 @@ def tag_attach(request, document_id=None, document_id_list=None):
form = TagListForm(user=request.user)
context = {
'object_name': _(u'Document'),
'form': form,
'previous': previous,
'next': next,
@@ -165,7 +164,6 @@ def tag_delete(request, tag_id=None, tag_id_list=None):
return HttpResponseRedirect(next)
context = {
'object_name': _(u'Tag'),
'delete_view': True,
'previous': previous,
'next': next,
@@ -209,7 +207,6 @@ def tag_edit(request, tag_id):
'title': _(u'Edit tag: %s') % tag,
'form': form,
'object': tag,
'object_name': _(u'Tag'),
}, context_instance=RequestContext(request))
@@ -225,7 +222,6 @@ class TagTaggedItemListView(DocumentListView):
'title': _(u'Documents with the tag "%s"') % self.get_tag(),
'hide_links': True,
'object': self.get_tag(),
'object_name': _(u'Tag'),
}

7
mayan/apps/user_management/views.py
View File

@@ -74,7 +74,6 @@ def user_edit(request, user_id):
'title': _(u'Edit user: %s') % user,
'form': form,
'object': user,
'object_name': _(u'User'),
}, context_instance=RequestContext(request))
@@ -130,7 +129,6 @@ def user_delete(request, user_id=None, user_id_list=None):
return HttpResponseRedirect(next)
context = {
'object_name': _(u'User'),
'delete_view': True,
'previous': previous,
'next': next,
@@ -192,7 +190,6 @@ def user_set_password(request, user_id=None, user_id_list=None):
form = PasswordForm()
context = {
'object_name': _(u'User'),
'next': next,
'form': form,
}
@@ -236,7 +233,6 @@ def user_groups(request, user_id):
decode_content_type=True,
extra_context={
'object': user,
'object_name': _(u'User'),
}
)
@@ -278,7 +274,6 @@ def group_edit(request, group_id):
'title': _(u'Edit group: %s') % group,
'form': form,
'object': group,
'object_name': _(u'Group'),
}, context_instance=RequestContext(request))
@@ -329,7 +324,6 @@ def group_delete(request, group_id=None, group_id_list=None):
return HttpResponseRedirect(next)
context = {
'object_name': _(u'Group'),
'delete_view': True,
'previous': previous,
'next': next,
@@ -373,6 +367,5 @@ def group_members(request, group_id):
decode_content_type=True,
extra_context={
'object': group,
'object_name': _(u'Group'),
}
)