From d8a880105a8d393405d63031a0579302e177779a Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Tue, 6 Sep 2011 23:23:05 +0200 Subject: [PATCH] Some minor renames (applications # -> no., beamer -> projector etc.) --- openslides/agenda/templates/agenda/overview.html | 2 +- .../application/templates/application/poll_view.html | 4 ++-- .../application/templates/application/view.html | 9 +++++---- .../templates/participant/base_participant.html | 4 ++-- openslides/utils/pdf.py | 11 ++++++----- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index 9f9769d17..abd52f81b 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -53,7 +53,7 @@ {% endif %} - + {% if perms.agenda.can_manage_agenda %} diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html index ed9f67e7e..93a217ea3 100644 --- a/openslides/application/templates/application/poll_view.html +++ b/openslides/application/templates/application/poll_view.html @@ -5,7 +5,7 @@ {% block submenu %} {{ block.super }}
-

{%trans "Application" %} #{{ poll.application.number }}

+

{%trans "Application No." %} {{ poll.application.number }}

@@ -13,7 +13,7 @@ {% endif %} {% block content %} -

{%trans "Application" %} #{{ poll.application.number }} - {%trans "Vote" %}

+

{%trans "Application No." %} {{ poll.application.number }} - {%trans "Vote" %}

{{ poll.application.title }}

{%trans "Results of" %} {{ ballot }}. {%trans "Vote" %}

diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index e0e599975..1ea94f19c 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -206,12 +206,13 @@
-

{% trans "Application" %} +

{% if application.number != None %} - #{{ application.number }} + {% trans "Application No." %} {{ application.number }} {% else %} - [no number] - {% endif %}

+ {% trans "Application" %} [no number] + {% endif %} + {% trans "Version" %} {{ version.aid }} {% if application.public_version != application.last_version %} {% if version == application.public_version %} diff --git a/openslides/participant/templates/participant/base_participant.html b/openslides/participant/templates/participant/base_participant.html index 11fe855c7..db1a1c4f2 100644 --- a/openslides/participant/templates/participant/base_participant.html +++ b/openslides/participant/templates/participant/base_participant.html @@ -14,8 +14,8 @@
  • {%trans "New user group" %}
  • {%trans 'Print participant list' %}
  • {%trans 'Import participant' %}
  • -
  • {% trans 'Generate first passwords' %}
  • -
  • {% trans 'Print password list' %}
  • +
  • {% trans 'Generate first time passwords' %}
  • +
  • {% trans 'Print first time passwords' %}
  • {% endif %} {% endblock %} diff --git a/openslides/utils/pdf.py b/openslides/utils/pdf.py index cff205e1b..dca79b5ff 100755 --- a/openslides/utils/pdf.py +++ b/openslides/utils/pdf.py @@ -337,7 +337,7 @@ def get_application(application, story): if application.number is None: story.append(Paragraph(_("Application No.")+" [-]", stylesheet['Heading1'])) else: - story.append(Paragraph(_("Application Nr.")+" %s" % application.number, stylesheet['Heading1'])) + story.append(Paragraph(_("Application No.")+" %s" % application.number, stylesheet['Heading1'])) # title story.append(Paragraph(_("Subject")+": "+application.title, stylesheet['Heading3'])) @@ -359,8 +359,9 @@ def get_application(application, story): cell2b = [] for s in application.supporter.all(): cell2b.append(Paragraph(".  %s" % unicode(s.profile), stylesheet['Signaturefield'])) - for x in range(0,application.missing_supporters): - cell2b.append(Paragraph(".  __________________________________________",stylesheet['Signaturefield'])) + if application.status == "pub": + for x in range(0,application.missing_supporters): + cell2b.append(Paragraph(".  __________________________________________",stylesheet['Signaturefield'])) cell2b.append(Spacer(0,0.2*cm)) # status @@ -421,7 +422,7 @@ def print_application(request, application_id=None): story.append(Paragraph(_("Applications"), stylesheet['Heading1'])) # List of applications for application in Application.objects.exclude(number=None).order_by('number'): - story.append(Paragraph(_("Application")+" #%s: %s" % (application.number, application.title), stylesheet['Heading3'])) + story.append(Paragraph(_("Application No.")+" %s: %s" % (application.number, application.title), stylesheet['Heading3'])) # Applications details (each application on single page) for application in Application.objects.exclude(number=None).order_by('number'): story.append(PageBreak()) @@ -449,7 +450,7 @@ def print_application_poll(request, poll_id=None): circle = "  " % imgpath cell = [] cell.append(Spacer(0,0.8*cm)) - cell.append(Paragraph(_("Application")+" #"+str(poll.application.number), stylesheet['Ballot_title'])) + cell.append(Paragraph(_("Application No.")+" "+str(poll.application.number), stylesheet['Ballot_title'])) cell.append(Paragraph(poll.application.title, stylesheet['Ballot_subtitle'])) cell.append(Paragraph(str(poll.ballot)+". "+_("Vote"), stylesheet['Ballot_description'])) cell.append(Spacer(0,0.5*cm))