From 0b033271f89a697598c0d12c23f15d16de85183c Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Mon, 16 Jul 2012 14:00:29 +0200 Subject: [PATCH] fix some typos, mostly {%trans to {% trans --- INSTALL | 20 +++---- .../agenda/templates/agenda/base_agenda.html | 20 +++---- .../agenda/templates/agenda/config.html | 6 +- openslides/agenda/templates/agenda/edit.html | 14 ++--- .../agenda/templates/agenda/overview.html | 8 +-- .../templates/projector/AgendaSummary.html | 2 +- .../application/base_application.html | 22 ++++---- .../templates/application/config.html | 6 +- .../templates/application/edit.html | 14 ++--- .../templates/application/import.html | 8 +-- .../templates/application/overview.html | 40 ++++++------- .../templates/application/poll_view.html | 10 ++-- .../templates/application/view.html | 18 +++--- .../templates/projector/Application.html | 6 +- .../templates/assignment/base_assignment.html | 20 +++---- .../templates/assignment/config.html | 6 +- .../assignment/templates/assignment/edit.html | 12 ++-- .../templates/assignment/overview.html | 24 ++++---- .../templates/assignment/poll_view.html | 18 +++--- .../assignment/templates/assignment/view.html | 16 +++--- .../templates/projector/Assignment.html | 4 +- .../config/templates/config/base_config.html | 2 +- .../config/templates/config/general.html | 12 ++-- .../participant/base_participant.html | 14 ++--- .../templates/participant/config.html | 6 +- .../templates/participant/edit.html | 12 ++-- .../templates/participant/group_edit.html | 12 ++-- .../templates/participant/group_overview.html | 12 ++-- .../templates/participant/import.html | 4 +- .../templates/participant/login.html | 10 ++-- .../templates/participant/overview.html | 56 +++++++++---------- .../participant/password_change.html | 4 +- .../templates/participant/settings.html | 4 +- .../templates/projector/base_projector.html | 2 +- .../projector/templates/projector/new.html | 6 +- .../projector/templates/projector/widget.html | 2 +- openslides/templates/404.html | 2 +- openslides/templates/500.html | 2 +- openslides/templates/base.html | 6 +- openslides/templates/front_page.html | 4 +- 40 files changed, 233 insertions(+), 233 deletions(-) diff --git a/INSTALL b/INSTALL index 7ba3b66c4..ce9cefb23 100644 --- a/INSTALL +++ b/INSTALL @@ -19,11 +19,11 @@ I. Installation on Windows (32/64bit) installed first: Python Programming Language 2.7, Setuptools, ReportLab Toolkit, Python Imaging Library (PIL), Django and django-mptt: - + a) Download and run 32bit MSI installer from http://www.python.org/: - + http://python.org/ftp/python/2.7.3/python-2.7.3.msi - + b) Add python dirs to PATH (via Control Panel > System > Advanced): ";C:\Python27;C:\Python27\Scripts" @@ -32,12 +32,12 @@ I. Installation on Windows (32/64bit) Download and run 32bit binary installer from http://pypi.python.org/pypi/setuptools: - + http://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe d) Install ReportLab Toolkit, Python Imaging Library (PIL), Django and django-mptt: - + Open command line (cmd) and run: easy_install django django-mptt reportlab pil @@ -54,9 +54,9 @@ I. Installation on Windows (32/64bit) b) Clone development version from mercurial repository http://hg.openslides.org. This requires Mercurial source control management (hg), see http://mercurial.selenic.com. - + Open command line (cmd) and run: - + hg clone http://hg.openslides.org OpenSlides 3. Start OpenSlides server and open URL in your default browser: @@ -80,7 +80,7 @@ II. Installation on GNU/Linux and MacOSX OpenSlides requires following programs, which should be installed first: Python Programming Language 2 (>= 2.5), - virtualenv (>= 1.4.1), ReportLab Toolkit and + virtualenv (>= 1.4.1), ReportLab Toolkit and Python Imaging Library (PIL): E.g. for ubuntu run: @@ -95,7 +95,7 @@ II. Installation on GNU/Linux and MacOSX b) Clone development version from mercurial repository http://hg.openslides.org. This requires Mercurial source control management (hg): - + E.g. for Ubuntu run: $ sudo apt-get install mercurial $ hg clone http://hg.openslides.org OpenSlides @@ -135,5 +135,5 @@ II. Installation on GNU/Linux and MacOSX 7. Restart OpenSlides: To restart OpenSlides after closing the terminal activate the - virtual envirnonment (see 4.) before starting the server (see 6.). + virtual environment (see 4.) before starting the server (see 6.). diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html index a70bb6937..1da6ca241 100644 --- a/openslides/agenda/templates/agenda/base_agenda.html +++ b/openslides/agenda/templates/agenda/base_agenda.html @@ -7,13 +7,13 @@ {% block submenu %} {% url item_overview as url_itemoverview %} {% url item_new as url_itemnew %} -

{%trans "Agenda" %}

+

{% trans "Agenda" %}

{# second submenu #} @@ -23,19 +23,19 @@ {% endif %} diff --git a/openslides/agenda/templates/agenda/config.html b/openslides/agenda/templates/agenda/config.html index 205199c59..0ef26b8d5 100644 --- a/openslides/agenda/templates/agenda/config.html +++ b/openslides/agenda/templates/agenda/config.html @@ -5,16 +5,16 @@ {% block title %}{{ block.super }} – {% trans "Agenda settings" %}{% endblock %} {% block content %} -

{%trans "Agenda settings" %}

+

{% trans "Agenda settings" %}

{% csrf_token %} {{ form.as_p }}

diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html index 57b03fb89..c91176fe4 100644 --- a/openslides/agenda/templates/agenda/edit.html +++ b/openslides/agenda/templates/agenda/edit.html @@ -3,7 +3,7 @@ {% load i18n %} {% block title %} - {{ block.super }} – + {{ block.super }} – {% if item %} {{ item.title }} – {% trans "Edit item" %} {% else %} @@ -13,25 +13,25 @@ {% block content %} {% if item %} -

{%trans "Edit item" %}

+

{% trans "Edit item" %}

{% else %} -

{%trans "New item" %}

+

{% trans "New item" %}

{% endif %} {% csrf_token %} {{ form.as_p }}

- * {%trans "required" %} + * {% trans "required" %}
{% endblock %} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index 32ea299dc..f847d9704 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -44,7 +44,7 @@ {% endif %} @@ -52,8 +52,8 @@

{% trans "Agenda" %}

- {%trans "Filter" %}: - {%trans "Hide closed items" %} + {% trans "Filter" %}: + {% trans "Hide closed items" %}

{{ items|length }} {% blocktrans count counter=items|length %}item{% plural %}items{% endblocktrans %} @@ -99,7 +99,7 @@ {% endfor %} {% else %} - {%trans "No items available." %} + {% trans "No items available." %} {% endif %} diff --git a/openslides/agenda/templates/projector/AgendaSummary.html b/openslides/agenda/templates/projector/AgendaSummary.html index 87ef6da55..a05be9af8 100644 --- a/openslides/agenda/templates/projector/AgendaSummary.html +++ b/openslides/agenda/templates/projector/AgendaSummary.html @@ -3,7 +3,7 @@ {% load i18n %} {% block title %}{{ block.super }} - - {% if title %} {{ title }} {% else %} {%trans "Agenda" %} {% endif %} + {% if title %} {{ title }} {% else %} {% trans "Agenda" %} {% endif %} {% endblock %} {% block content %} diff --git a/openslides/application/templates/application/base_application.html b/openslides/application/templates/application/base_application.html index 8d5ec33d8..03322c352 100644 --- a/openslides/application/templates/application/base_application.html +++ b/openslides/application/templates/application/base_application.html @@ -6,16 +6,16 @@ {% block submenu %} {% url application_overview as url_applicationoverview %} -

{%trans "Applications" %}

+

{% trans "Applications" %}

{# second submenu #} @@ -31,22 +31,22 @@ diff --git a/openslides/application/templates/application/config.html b/openslides/application/templates/application/config.html index b5403f301..8dd65eddf 100644 --- a/openslides/application/templates/application/config.html +++ b/openslides/application/templates/application/config.html @@ -5,16 +5,16 @@ {% block title %}{{ block.super }} – {% trans "Application settings" %}{% endblock %} {% block content %} -

{%trans "Application settings" %}

+

{% trans "Application settings" %}

{% csrf_token %} {{ form.as_p }}

diff --git a/openslides/application/templates/application/edit.html b/openslides/application/templates/application/edit.html index 5701c9b8a..fd07579b9 100644 --- a/openslides/application/templates/application/edit.html +++ b/openslides/application/templates/application/edit.html @@ -3,7 +3,7 @@ {% load i18n %} {% block title %} - {{ block.super }} – + {{ block.super }} – {% if application %} {% trans "Edit application" %} {% else %} @@ -13,9 +13,9 @@ {% block content %} {% if application %} -

{%trans "Edit application" %}

+

{% trans "Edit application" %}

{% else %} -

{%trans "New application" %}

+

{% trans "New application" %}

{% endif %} {% csrf_token %} @@ -23,18 +23,18 @@ {{ managerform.as_p }}

- * {%trans "required" %} + * {% trans "required" %}
{% endblock %} diff --git a/openslides/application/templates/application/import.html b/openslides/application/templates/application/import.html index 9fae8ab54..aff1044a0 100644 --- a/openslides/application/templates/application/import.html +++ b/openslides/application/templates/application/import.html @@ -5,7 +5,7 @@ {% block title %}{{ block.super }} – {% trans "Import applications" %} {% endblock %} {% block content %} -

{%trans "Import applications" %}

+

{% trans "Import applications" %}

{% trans 'Select a CSV file to import applications!' %}

{% trans 'Required comma separated values: {number, title, text, reason, first_name, last_name} (number and reason are optional and may be empty)' %} @@ -20,14 +20,14 @@ {{ form.as_p }}

- * {%trans "required" %} + * {% trans "required" %} {% endblock %} diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html index e487d55d8..2e72d568d 100644 --- a/openslides/application/templates/application/overview.html +++ b/openslides/application/templates/application/overview.html @@ -7,24 +7,24 @@ {% block title %}{{ block.super }} – {% trans "Applications" %}{% endblock %} {% block content %} -

{%trans "Applications" %}

+

{% trans "Applications" %}

- {%trans "Filter" %}: + {% trans "Filter" %}: {% if min_supporters > 0 %} {%trans "Need supporters" %}   + {% if 'on' in request.GET.needsup %}checked{% endif %}> {% trans "Need supporters" %}   {% endif %} {%trans "Without number" %}   + {% if 'on' in request.GET.number %}checked{% endif %}> {% trans "Without number" %}   {%trans "Status" %}: + {% if 'on' in request.GET.status %}checked{% endif %}> {% trans "Status" %}:

@@ -32,19 +32,19 @@ {% blocktrans count counter=applications|length %}application{% plural %}applications{% endblocktrans %} - - + + {% if min_supporters > 0 %} - + {% endif %} - - - + + + {% for app_info in applications %} {% with application=app_info.application useractions=app_info.actions %} - @@ -74,14 +74,14 @@ {% endif %} {% endif %} - + {% endwith %} {% empty %} - + {% endfor %}
{%trans "Number" %}{%trans "Application title" %}{% trans "Number" %}{% trans "Application title" %}{%trans "Number of supporters" %}{% trans "Number of supporters" %}{%trans "Status" %}{%trans "Submitter" %}{%trans "Creation Time" %}{% trans "Status" %}{% trans "Submitter" %}{% trans "Creation Time" %} {% trans "Actions" %}
{% if application.number %}{{ application.number }}{% else %}-{% endif %} {{ application.public_version.title }}
{%trans "No applications available." %}{% trans "No applications available." %}
diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html index c4b340c54..6a25277bf 100644 --- a/openslides/application/templates/application/poll_view.html +++ b/openslides/application/templates/application/poll_view.html @@ -42,21 +42,21 @@

- +

diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index 9f2e4a0f8..0ae213ab0 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -51,7 +51,7 @@ {% if "genpoll" in actions %} - {%trans 'New vote' %} + {% trans 'New vote' %} {% else %} @@ -91,7 +91,7 @@ {% if forloop.last %} {% if "genpoll" in actions %} - {%trans 'New vote' %} + {% trans 'New vote' %} {% endif %} {% endif %} @@ -99,7 +99,7 @@ {% else %} {% if perms.application.can_manage_application %} - {%trans 'Enter result' %} + {% trans 'Enter result' %} {% endif %} {% endif %} @@ -116,7 +116,7 @@ {% if "wit" in actions and user == application.submitter %}

- {%trans 'Withdraw' %} + {% trans 'Withdraw' %} {% endif %} @@ -167,12 +167,12 @@

{% trans "Result after vote" %}:

{% if "acc" in actions %} - {%trans 'Accepted' %} + {% trans 'Accepted' %} {% endif %} {% if "rej" in actions %} - {%trans 'Rejected' %} + {% trans 'Rejected' %} {% endif %} {% endif %} @@ -194,9 +194,9 @@ {% endif %}

-

{%trans "For Administration only:" %}

+

{% trans "For Administration only:" %}

- {%trans 'Reset' %} + {% trans 'Reset' %} {% endif %} {# end perms.application.can_support_application #} @@ -256,7 +256,7 @@ {% if application.status != "pub" %} {% if revision == application.permitted %} - + {% else %} {% if perms.application.can_manage_application %} diff --git a/openslides/application/templates/projector/Application.html b/openslides/application/templates/projector/Application.html index ab6b7ed09..9f7dddaf7 100644 --- a/openslides/application/templates/projector/Application.html +++ b/openslides/application/templates/projector/Application.html @@ -4,11 +4,11 @@ {% load i18n %} {% load staticfiles %} -{% block title %}{{ block.super }} - {%trans "Application" %} {{ application.number }}{% endblock %} +{% block title %}{{ block.super }} - {% trans "Application" %} {{ application.number }}{% endblock %} {% block content %}