Text string tweaks as per translation discussions. Thanks to Berny.

This commit is contained in:
Roberto Rosario
2015-08-20 14:41:00 -04:00
parent 75764fd482
commit 93553e84c2
7 changed files with 20 additions and 14 deletions

View File

@@ -16,7 +16,8 @@ class Comment(models.Model):
settings.AUTH_USER_MODEL, editable=False, related_name='comments',
verbose_name=_('User'),
)
comment = models.TextField(verbose_name=_('comment'))
# Translators: Comment here is a noun and refers to the actual text stored
comment = models.TextField(verbose_name=_('Comment'))
submit_date = models.DateTimeField(
auto_now_add=True, db_index=True,
verbose_name=_('Date time submitted')

View File

@@ -43,7 +43,7 @@ def comment_delete(request, comment_id=None, comment_id_list=None):
)
if not comments:
messages.error(request, _('Must provide at least one comment.'))
messages.error(request, _('At least one comment must be selected.'))
return HttpResponseRedirect(
request.META.get(
'HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)

View File

@@ -87,7 +87,7 @@ link_document_print = Link(
view='documents:document_print', args='object.id'
)
link_document_update_page_count = Link(
permissions=(permission_document_tools,), text=_('Reset page count'),
permissions=(permission_document_tools,), text=_('Recalculate page count'),
view='documents:document_update_page_count', args='object.pk'
)
link_document_restore = Link(
@@ -116,7 +116,7 @@ link_document_multiple_download = Link(
view='documents:document_multiple_download'
)
link_document_multiple_update_page_count = Link(
permissions=(permission_document_tools,), text=_('Reset page count'),
permissions=(permission_document_tools,), text=_('Recalculate page count'),
view='documents:document_multiple_update_page_count'
)
link_document_multiple_restore = Link(

View File

@@ -158,7 +158,10 @@ class Document(models.Model):
verbose_name=_('Date and time trashed')
)
is_stub = models.BooleanField(
default=True, editable=False, verbose_name=_('Is stub?')
default=True, editable=False, help_text=_(
'A document stub is a document with an entry on the database but '
'no file uploaded. This could be an interrupted upload or a '
'deferred upload via the API.'), verbose_name=_('Is stub?')
)
objects = DocumentManager()

View File

@@ -28,7 +28,7 @@ permission_document_properties_edit = namespace.add_permission(
name='document_properties_edit', label=_('Edit document properties')
)
permission_document_print = namespace.add_permission(
name='document_print', label=_('Can print documents')
name='document_print', label=_('Print documents')
)
permission_document_restore = namespace.add_permission(
name='document_restore', label=_('Restore deleted document')

View File

@@ -644,7 +644,7 @@ def document_update_page_count(request, document_id=None, document_id_list=None)
elif document_id_list:
documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')]
else:
messages.error(request, _('Must provide at least one document.'))
messages.error(request, _('At least one document must be selected.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
try:
@@ -661,8 +661,8 @@ def document_update_page_count(request, document_id=None, document_id_list=None)
messages.success(
request,
ungettext(
_('Document queued for page count reset.'),
_('Documents queued for page count reset.'),
_('Document queued for page count recalculation.'),
_('Documents queued for page count recalculation.'),
len(documents)
)
)
@@ -671,8 +671,8 @@ def document_update_page_count(request, document_id=None, document_id_list=None)
context = {
'previous': previous,
'title': ungettext(
'Reset the page count of the selected document?',
'Reset the page count of the selected documents?',
'Recalculation the page count of the selected document?',
'Recalculation the page count of the selected documents?',
len(documents)
)
}
@@ -680,8 +680,10 @@ def document_update_page_count(request, document_id=None, document_id_list=None)
if len(documents) == 1:
context['object'] = documents[0]
return render_to_response('appearance/generic_confirm.html', context,
context_instance=RequestContext(request))
return render_to_response(
'appearance/generic_confirm.html', context,
context_instance=RequestContext(request)
)
def document_multiple_update_page_count(request):

View File

@@ -14,7 +14,7 @@ permission_ocr_document_delete = namespace.add_permission(
)
permission_ocr_content_view = namespace.add_permission(
name='ocr_content_view',
label=_('Can view the transcribed text from document')
label=_('View the transcribed text from document')
)
permission_document_type_ocr_setup = namespace.add_permission(
name='ocr_document_type_setup',