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

Issue #39, Finish capitalizing source text messages

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-10 02:29:37 -04:00
parent 0479c0a3cb
commit a75a4edf21
17 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/acls/models.py
View File

@@ -23,7 +23,7 @@ class AccessEntry(models.Model):
"""
Model that hold the permission, object, actor relationship
"""
permission = models.ForeignKey(StoredPermission, verbose_name=_(u'permission'))
permission = models.ForeignKey(StoredPermission, verbose_name=_(u'Permission'))
holder_type = models.ForeignKey(
ContentType,
@@ -65,7 +65,7 @@ class DefaultAccessEntry(models.Model):
def get_classes(cls):
return [AccessObjectClass.encapsulate(cls) for cls in get_classes()]
permission = models.ForeignKey(StoredPermission, verbose_name=_(u'permission'))
permission = models.ForeignKey(StoredPermission, verbose_name=_(u'Permission'))
holder_type = models.ForeignKey(
ContentType,

4
mayan/apps/checkouts/literals.py
View File

@@ -11,6 +11,6 @@ STATE_ICONS = {
}
STATE_LABELS = {
STATE_CHECKED_OUT: _(u'checked out'),
STATE_CHECKED_IN: _(u'checked in/available'),
STATE_CHECKED_OUT: _(u'Checked out'),
STATE_CHECKED_IN: _(u'Checked in/available'),
}

12
mayan/apps/checkouts/models.py
View File

@@ -21,14 +21,14 @@ class DocumentCheckout(models.Model):
"""
Model to store the state and information of a document checkout
"""
document = models.ForeignKey(Document, verbose_name=_(u'document'), unique=True)
checkout_datetime = models.DateTimeField(verbose_name=_(u'check out date and time'), blank=True, null=True)
expiration_datetime = models.DateTimeField(verbose_name=_(u'check out expiration date and time'), help_text=_(u'Amount of time to hold the document checked out in minutes.'))
document = models.ForeignKey(Document, verbose_name=_(u'Document'), unique=True)
checkout_datetime = models.DateTimeField(verbose_name=_(u'Check out date and time'), blank=True, null=True)
expiration_datetime = models.DateTimeField(verbose_name=_(u'Check out expiration date and time'), help_text=_(u'Amount of time to hold the document checked out in minutes.'))
user_content_type = models.ForeignKey(ContentType, null=True, blank=True) # blank and null added for ease of db migration
user_object_id = models.PositiveIntegerField(null=True, blank=True)
user_object = generic.GenericForeignKey(ct_field='user_content_type', fk_field='user_object_id')
block_new_version = models.BooleanField(default=True, verbose_name=_(u'block new version upload'), help_text=_(u'Do not allow new version of this document to be uploaded.'))
block_new_version = models.BooleanField(default=True, verbose_name=_(u'Block new version upload'), help_text=_(u'Do not allow new version of this document to be uploaded.'))
# block_metadata
# block_editing
@@ -51,5 +51,5 @@ class DocumentCheckout(models.Model):
return ('checkout:checkout_info', [self.document.pk])
class Meta:
verbose_name = _(u'document checkout')
verbose_name_plural = _(u'document checkouts')
verbose_name = _(u'Document checkout')
verbose_name_plural = _(u'Document checkouts')

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

@@ -54,7 +54,7 @@ def checkout_info(request, document_pk):
paragraphs.append(_(u'User: %s') % get_object_name(checkout_info.user_object, display_object_type=False))
paragraphs.append(_(u'Check out time: %s') % checkout_info.checkout_datetime)
paragraphs.append(_(u'Check out expiration: %s') % checkout_info.expiration_datetime)
paragraphs.append(_(u'New versions allowed: %s') % (_(u'yes') if not checkout_info.block_new_version else _(u'no')))
paragraphs.append(_(u'New versions allowed: %s') % (_(u'Yes') if not checkout_info.block_new_version else _(u'No')))
return render_to_response('main/generic_template.html', {
'paragraphs': paragraphs,

2
mayan/apps/common/utils.py
View File

@@ -113,7 +113,7 @@ def pretty_size_10(size):
def return_type(value):
if isinstance(value, types.FunctionType):
return value.__doc__ if value.__doc__ else _(u'function found')
return value.__doc__ if value.__doc__ else _(u'Function found')
elif isinstance(value, types.ClassType):
return u'%s.%s' % (value.__class__.__module__, value.__class__.__name__)
elif isinstance(value, types.TypeType):

8
mayan/apps/converter/links.py
View File

@@ -1,8 +0,0 @@
from django.utils.translation import ugettext_lazy as _
def is_superuser(context):
return context['request'].user.is_staff or context['request'].user.is_superuser
formats_list = {'text': _('file formats'), 'view': 'converter:formats_list', 'famfam': 'pictures', 'icon': 'pictures.png', 'condition': is_superuser, 'children_view_regex': [r'formats_list']}

12
mayan/apps/converter/literals.py
View File

@@ -19,30 +19,30 @@ TRANSFORMATION_CHOICES = {
'label': _(u'Resize'),
'description': _(u'Resize.'),
'arguments': [
{'name': 'width', 'label': _(u'width'), 'required': True},
{'name': 'height', 'label': _(u'height'), 'required': False},
{'name': 'width', 'label': _(u'Width'), 'required': True},
{'name': 'height', 'label': _(u'Height'), 'required': False},
]
},
TRANSFORMATION_ROTATE: {
'label': _(u'Rotate'),
'description': _(u'Rotate by n degress.'),
'arguments': [
{'name': 'degrees', 'label': _(u'degrees'), 'required': True}
{'name': 'degrees', 'label': _(u'Degrees'), 'required': True}
]
},
TRANSFORMATION_DENSITY: {
'label': _(u'Density'),
'description': _(u'Change the resolution (ie: DPI) without resizing.'),
'arguments': [
{'name': 'width', 'label': _(u'width'), 'required': True},
{'name': 'height', 'label': _(u'height'), 'required': False},
{'name': 'width', 'label': _(u'Width'), 'required': True},
{'name': 'height', 'label': _(u'Height'), 'required': False},
]
},
TRANSFORMATION_ZOOM: {
'label': _(u'Zoom'),
'description': _(u'Zoom by n percent.'),
'arguments': [
{'name': 'percent', 'label': _(u'percent'), 'required': True}
{'name': 'percent', 'label': _(u'Percent'), 'required': True}
]
},
}

18
mayan/apps/django_gpg/views.py
View File

@@ -64,10 +64,10 @@ def key_list(request, secret=True):
if secret:
object_list = Key.get_all(gpg, secret=True)
title = _(u'private keys')
title = _(u'Private keys')
else:
object_list = Key.get_all(gpg)
title = _(u'public keys')
title = _(u'Public keys')
return render_to_response('main/generic_list.html', {
'object_list': object_list,
@@ -148,31 +148,31 @@ def key_query(request):
'attribute': 'keyid',
},
{
'name': _(u'type'),
'name': _(u'Type'),
'attribute': 'algo',
},
{
'name': _(u'creation date'),
'name': _(u'Creation date'),
'attribute': 'creation_date',
},
{
'name': _(u'disabled'),
'name': _(u'Disabled'),
'attribute': 'disabled',
},
{
'name': _(u'expiration date'),
'name': _(u'Expiration date'),
'attribute': 'expiration_date',
},
{
'name': _(u'expired'),
'name': _(u'Expired'),
'attribute': 'expired',
},
{
'name': _(u'length'),
'name': _(u'Length'),
'attribute': 'key_length',
},
{
'name': _(u'revoked'),
'name': _(u'Revoked'),
'attribute': 'revoked',
},

6
mayan/apps/document_comments/__init__.py
View File

@@ -29,15 +29,15 @@ class_permissions(Document, [PERMISSION_COMMENT_CREATE,
register_model_list_columns(Comment, [
{
'name': _(u'date'),
'name': _(u'Date'),
'attribute': 'submit_date'
},
{
'name': _(u'user'),
'name': _(u'User'),
'attribute': encapsulate(lambda x: x.user.get_full_name() if x.user.get_full_name() else x.user)
},
{
'name': _(u'comment'),
'name': _(u'Comment'),
'attribute': 'comment'
}
])

2
mayan/apps/document_comments/views.py
View File

@@ -123,7 +123,7 @@ def comments_for_document(request, document_id):
return render_to_response('main/generic_list.html', {
'object': document,
'access_object': document,
'title': _(u'comments: %s') % document,
'title': _(u'Comments for document: %s') % document,
'object_list': Comment.objects.for_model(document).order_by('-submit_date'),
'hide_link': True,
'hide_object': True,

2
mayan/apps/document_indexing/utils.py
View File

@@ -18,7 +18,7 @@ def get_document_indexing_subtemplate(document):
return {
'name': 'main/generic_list_subtemplate.html',
'context': {
'title': _(u'document indexes'),
'title': _(u'Document indexes'),
'object_list': object_list,
'hide_link': True
}

2
mayan/apps/documents/__init__.py
View File

@@ -102,7 +102,7 @@ register_links('documents:document_page_transformation_create', [document_page_t
register_links(['documents:document_page_transformation_edit', 'documents:document_page_transformation_delete'], [document_page_transformation_create], menu_name='sidebar')
register_diagnostic('documents', _(u'Documents'), document_missing_list)
register_maintenance_links([document_find_all_duplicates, document_update_page_count, document_clear_image_cache], namespace='documents', title=_(u'documents'))
register_maintenance_links([document_find_all_duplicates, document_update_page_count, document_clear_image_cache], namespace='documents', title=_(u'Documents'))
register_model_list_columns(Document, [
{
'name': _(u'Thumbnail'), 'attribute':

2
mayan/apps/documents/models.py
View File

@@ -327,7 +327,7 @@ class DocumentVersion(models.Model):
major = models.PositiveIntegerField(verbose_name=_(u'Mayor'), default=1)
minor = models.PositiveIntegerField(verbose_name=_(u'Minor'), default=0)
micro = models.PositiveIntegerField(verbose_name=_(u'Micro'), default=0)
release_level = models.PositiveIntegerField(choices=RELEASE_LEVEL_CHOICES, default=RELEASE_LEVEL_FINAL, verbose_name=_(u'release level'))
release_level = models.PositiveIntegerField(choices=RELEASE_LEVEL_CHOICES, default=RELEASE_LEVEL_FINAL, verbose_name=_(u'Release level'))
serial = models.PositiveIntegerField(verbose_name=_(u'Serial'), default=0)
timestamp = models.DateTimeField(verbose_name=_(u'Timestamp'), editable=False, db_index=True)
comment = models.TextField(blank=True, verbose_name=_(u'Comment'))

2
mayan/apps/dynamic_search/views.py
View File

@@ -46,7 +46,7 @@ def results(request, extra_context=None):
'result_count': result_count}
else:
title = _(u'results')
title = _(u'Results')
# Update the context with the search results
context.update({

2
mayan/apps/metadata/forms.py
View File

@@ -63,7 +63,7 @@ class MetadataForm(forms.Form):
except Exception as exception:
self.fields['value'].initial = exception
id = forms.CharField(label=_(u'id'), widget=forms.HiddenInput)
id = forms.CharField(label=_(u'ID'), widget=forms.HiddenInput)
name = forms.CharField(label=_(u'Name'), required=False, widget=forms.TextInput(attrs={'readonly': 'readonly'}))
value = forms.CharField(label=_(u'Value'), required=False)

6
mayan/apps/statistics/links.py
View File

@@ -7,7 +7,7 @@ def is_superuser(context):
return context['request'].user.is_staff or context['request'].user.is_superuser
link_execute = {'text': _(u'execute'), 'view': 'statistics:execute', 'args': 'object.id', 'famfam': 'lightning', 'condition': is_superuser}
link_namespace_details = {'text': _(u'details'), 'view': 'statistics:namespace_details', 'args': 'namespace.id', 'famfam': 'chart_curve_go', 'condition': is_superuser}
link_namespace_list = {'text': _(u'namespace list'), 'view': 'statistics:namespace_list', 'famfam': 'chart_curve', 'condition': is_superuser, 'children_view_regex': [r'statistics']}
link_execute = {'text': _(u'Execute'), 'view': 'statistics:execute', 'args': 'object.id', 'famfam': 'lightning', 'condition': is_superuser}
link_namespace_details = {'text': _(u'Details'), 'view': 'statistics:namespace_details', 'args': 'namespace.id', 'famfam': 'chart_curve_go', 'condition': is_superuser}
link_namespace_list = {'text': _(u'Namespace list'), 'view': 'statistics:namespace_list', 'famfam': 'chart_curve', 'condition': is_superuser, 'children_view_regex': [r'statistics']}
link_statistics = {'text': _(u'Statistics'), 'view': 'statistics:namespace_list', 'famfam': 'table', 'icon': 'blackboard_sum.png', 'condition': is_superuser, 'children_view_regex': [r'statistics']}

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

@@ -32,7 +32,7 @@ def namespace_details(request, namespace_id):
'object_list': namespace.statistics,
'hide_link': True,
'title': _(u'Namespace details for: %s') % namespace,
'object_name': _(u'namespace'),
'object_name': _(u'Namespace'),
}, context_instance=RequestContext(request))
@@ -46,8 +46,8 @@ def execute(request, statistic_id):
'object': statictic,
'namespace': statictic.namespace,
'navigation_object_list': [
{'object': 'namespace', 'name': _(u'namespace')},
{'object': 'object', 'name': _(u'statistic')},
{'object': 'namespace', 'name': _(u'Namespace')},
{'object': 'object', 'name': _(u'Statistic')},
],
'object_list': statictic.get_results(),
'hide_link': True,