diff --git a/src/postorius/doc/news.rst b/src/postorius/doc/news.rst index fdd90d7..d706583 100644 --- a/src/postorius/doc/news.rst +++ b/src/postorius/doc/news.rst @@ -28,6 +28,7 @@ * Addedd an improved test harness using WebTest. Contributed by Aurélien Bompard. * Show error message in login view. Contributed by Aurélien Bompard (LP: 1094829). * Fix adding the a list owner on list creation. Contributed by Aurélien Bompard (LP: 1175967). +* Fix untranslatable template strings. Contributed by Sumana Harihareswara (LP: 1157947). 1.0 beta 1 -- "Year of the Parrot" diff --git a/src/postorius/templates/postorius/lists/confirm_delete.html b/src/postorius/templates/postorius/lists/confirm_delete.html index 5886d0d..f03d794 100644 --- a/src/postorius/templates/postorius/lists/confirm_delete.html +++ b/src/postorius/templates/postorius/lists/confirm_delete.html @@ -4,7 +4,7 @@ {% load nav_helpers %} {% block main %} - {% list_nav 'list_delete' 'Delete List' %} + {% list_nav 'list_delete' "Delete List" %}

{% trans "Are you sure you want to permanently delete this list?" %}

{% trans "All settings and membership data will be lost!" %}

diff --git a/src/postorius/templates/postorius/lists/held_messages.html b/src/postorius/templates/postorius/lists/held_messages.html index d2b3444..e63b5c9 100644 --- a/src/postorius/templates/postorius/lists/held_messages.html +++ b/src/postorius/templates/postorius/lists/held_messages.html @@ -6,7 +6,7 @@ {% block body_class %}list_summary{% endblock %} {% block main %} - {% list_nav 'list_held_messages' 'Held Messages' %} + {% list_nav 'list_held_messages' "Held Messages" %} diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html index 985997a..c9ea714 100644 --- a/src/postorius/templates/postorius/lists/mass_subscribe.html +++ b/src/postorius/templates/postorius/lists/mass_subscribe.html @@ -4,7 +4,7 @@ {% load nav_helpers %} {% block main %} - {% list_nav 'mass_subscribe' 'Mass Subscription' %} + {% list_nav 'mass_subscribe' "Mass Subscription" %} {% csrf_token %} {{ form.as_p }} diff --git a/src/postorius/templates/postorius/lists/memberoptions.html b/src/postorius/templates/postorius/lists/memberoptions.html index 211a830..766fc89 100644 --- a/src/postorius/templates/postorius/lists/memberoptions.html +++ b/src/postorius/templates/postorius/lists/memberoptions.html @@ -27,7 +27,7 @@ @@ -36,7 +36,7 @@ @@ -45,7 +45,7 @@ @@ -54,7 +54,7 @@ @@ -63,7 +63,7 @@ @@ -71,7 +71,7 @@ diff --git a/src/postorius/templates/postorius/lists/members.html b/src/postorius/templates/postorius/lists/members.html index 6a5c04d..5fccd41 100644 --- a/src/postorius/templates/postorius/lists/members.html +++ b/src/postorius/templates/postorius/lists/members.html @@ -4,7 +4,7 @@ {% load nav_helpers %} {% block main %} - {% list_nav 'list_members' 'List Members' %} + {% list_nav 'list_members' "List Members" %}

{% trans "Owners" %}

@@ -12,7 +12,7 @@ {% csrf_token %} {{ owner_form.owner_email }} - +

{% trans 'Mail Delivery:' %}

- [More info{{ settingsform.delivery_status.help_text }} + [{% trans "More info" %}{{ settingsform.delivery_status.help_text }} ]

{{settingsform.delivery_status }}

{% trans 'Mode of Delivery:' %}

- [More info{{ settingsform.delivery_mode.help_text }} + [{% trans "More info" %}{{ settingsform.delivery_mode.help_text }} ]

{{settingsform.delivery_mode }}

{% trans 'Receive own posts to the list?' %}

- [More info{{ settingsform.receive_own_postings.help_text }} + [{% trans "More info" %}{{ settingsform.receive_own_postings.help_text }} ]

{{settingsform.receive_own_postings }}

{% trans 'Receive acknowledgement mails?' %}

- [More info{{ settingsform.acknowledge_posts.help_text }} + [{% trans "More info" %}{{ settingsform.acknowledge_posts.help_text }} ]

{{settingsform.acknowledge_posts }}

{% trans 'Conceal address from the subscriber list?' %}

- [More info{{ settingsform.hide_address.help_text }} + [{% trans "More info" %}{{ settingsform.hide_address.help_text }} ]

{{settingsform.hide_address }}

{% trans 'Avoid duplicate copies of messages? ' %}

-

[More info{{ settingsform.receive_list_copy.help_text }} +

[{% trans "More info" %}{{ settingsform.receive_list_copy.help_text }} ]

{{settingsform.receive_list_copy }}
@@ -26,7 +26,7 @@ {% endfor %} @@ -38,7 +38,7 @@ {% csrf_token %} {{ moderator_form.moderator_email }} - +
{{ member }} - Delete + {% trans 'Delete' %}
@@ -53,7 +53,7 @@ {% endfor %} diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html index dbd5fd5..d51210b 100644 --- a/src/postorius/templates/postorius/lists/settings.html +++ b/src/postorius/templates/postorius/lists/settings.html @@ -20,12 +20,12 @@ {% endfor %}
{{ member }} - Delete + {% trans 'Delete' %}
{{ field.errors }} {{ field.label_tag }}
- [More info{{ field.help_text }} + [{% trans "More info" %}{{ field.help_text }} ]
{{ field }}
- +
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html index fc5a594..d6bf0ec 100644 --- a/src/postorius/templates/postorius/lists/summary.html +++ b/src/postorius/templates/postorius/lists/summary.html @@ -17,7 +17,7 @@ {% if user.is_authenticated %} {% if userSubscribed %} - Unsubscribe + {% trans "Unsubscribe" %} {% else %}

{% trans 'Subscribe to this list' %}

{% csrf_token %} @@ -26,7 +26,7 @@
{% endif %} {% else %} -

To subscribe or unsubscribe this list you have to be logged in.

-

Log In

+

{% trans "To subscribe to or unsubscribe from this list you have to be logged in." %}

+

{% trans "Log In" %}

{% endif %} {% endblock %} diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html index dcd545d..fb10795 100644 --- a/src/postorius/templates/postorius/login.html +++ b/src/postorius/templates/postorius/login.html @@ -5,7 +5,7 @@ {% block main %}
-

Login with username and password or with Mozilla Persona

+

{% trans "Login with username and password or with Mozilla Persona" %}

@@ -21,13 +21,13 @@
diff --git a/src/postorius/templates/postorius/menu/list_nav.html b/src/postorius/templates/postorius/menu/list_nav.html index a7a0f25..453da60 100644 --- a/src/postorius/templates/postorius/menu/list_nav.html +++ b/src/postorius/templates/postorius/menu/list_nav.html @@ -2,7 +2,7 @@ {% load i18n %} {% load nav_helpers %}
- {% trans 'Mailing Lists' %} » {{ list.fqdn_listname }} » {{ title }} + {% trans 'Mailing Lists' %} » {{ list.fqdn_listname }} » {% trans title %} {% if user|lower != 'anonymoususer' %}
  • {% trans "Info" %}
  • diff --git a/src/postorius/templates/postorius/site_settings.html b/src/postorius/templates/postorius/site_settings.html index 1908783..cf3bdb0 100644 --- a/src/postorius/templates/postorius/site_settings.html +++ b/src/postorius/templates/postorius/site_settings.html @@ -3,5 +3,5 @@ {% block main %} {% include 'postorius/menu/settings_nav.html' %} -

    General Settings

    +

    {% trans "General Settings" %}

    {% endblock main %} diff --git a/src/postorius/templates/postorius/user_address_activation_sent.html b/src/postorius/templates/postorius/user_address_activation_sent.html index 58c6d09..72cb84f 100644 --- a/src/postorius/templates/postorius/user_address_activation_sent.html +++ b/src/postorius/templates/postorius/user_address_activation_sent.html @@ -5,6 +5,6 @@ {% include 'postorius/menu/user_nav.html' %}

    {% trans 'Email address activation sent' %}

    -

    A confirmation link has been sent to the email address you submitted. Please check your email account an click on the confirmation link to add this address for your account.

    +

    {% trans "A confirmation link has been sent to the email address you submitted. Please check your email account and click on the confirmation link to add this address for your account." %}

    {% endblock main %} diff --git a/src/postorius/templates/postorius/user_address_preferences.html b/src/postorius/templates/postorius/user_address_preferences.html index 96e4141..71b1789 100644 --- a/src/postorius/templates/postorius/user_address_preferences.html +++ b/src/postorius/templates/postorius/user_address_preferences.html @@ -21,7 +21,7 @@ - + {% for form,address in zipped_data %} {% endfor %} @@ -29,8 +29,8 @@ @@ -40,8 +40,8 @@ @@ -51,8 +51,8 @@ @@ -62,8 +62,8 @@ @@ -73,8 +73,8 @@ @@ -84,8 +84,8 @@ diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html index 1f442d6..12a709d 100644 --- a/src/postorius/templates/postorius/user_mailmansettings.html +++ b/src/postorius/templates/postorius/user_mailmansettings.html @@ -19,59 +19,59 @@
    Preferences {% trans 'Preferences' %} {{address}}
    -

    Mail Delivery:

    -

    [More info{{ helperform.delivery_status.help_text }} +

    {% trans 'Mail Delivery' %}:

    +

    [{% trans 'More info' %}{{ helperform.delivery_status.help_text }} ]

    -

    Select a Mode of Delivery:

    -

    [More info{{ helperform.delivery_mode.help_text }} +

    {% trans 'Select a Mode of Delivery' %}:

    +

    [{% trans 'More info' %}{{ helperform.delivery_mode.help_text }} ]

    -

    Receive your own posts to the list?

    -

    [More info{{ helperform.receive_own_postings.help_text }} +

    {% trans 'Receive your own posts to the list?' %}

    +

    [{% trans 'More info' %}{{ helperform.receive_own_postings.help_text }} ]

    -

    Receive acknowledgement mails?

    -

    [More info{{ helperform.acknowledge_posts.help_text }} +

    {% trans 'Receive acknowledgement mails?' %}

    +

    [{% trans 'More info' %}{{ helperform.acknowledge_posts.help_text }} ]

    -

    Conceal yourself from the subscriber list?

    -

    [More info{{ helperform.hide_address.help_text }} +

    {% trans 'Conceal yourself from the subscriber list?' %}

    +

    [{% trans 'More info' %}{{ helperform.hide_address.help_text }} ]

    -

    Avoid duplicate copies of messages?

    -

    [More info{{ helperform.receive_list_copy.help_text }} +

    {% trans 'Avoid duplicate copies of messages?' %}

    +

    [{% trans 'More info' %}{{ helperform.receive_list_copy.help_text }} ]

    - - + + diff --git a/src/postorius/templates/postorius/user_settings.html b/src/postorius/templates/postorius/user_settings.html index d5c6a19..141b796 100644 --- a/src/postorius/templates/postorius/user_settings.html +++ b/src/postorius/templates/postorius/user_settings.html @@ -5,7 +5,7 @@ {% block main %} {% include 'postorius/menu/user_nav.html' %} -

    Membership

    +

    {% trans "Membership" %}

    {% ifequal tab "membership"%} {% trans "Membership Settings" %} {% if list %}{% trans "for"%}{% endif %} {{ list.fqdn_listname }} @@ -17,7 +17,7 @@
    {% trans "Content" %}
    -

    {%trans "Use this page to manage your account. You'll be able to see a list of your subscribed lists, modify these membership settings of the list and your personal preferences in user_settings LP:821438 is solved
    " %}

    +

    {% trans "Use this page to manage your account. You'll be able to see a list of your subscribed lists, modify these membership settings of the list and your personal preferences in user_settings LP:821438 is solved
    " %}

    {% if form %} {% csrf_token %} - + {% for field in form.visible_fields %} - {% endfor %}
    Preferences Global {% trans "Preferences" %} {% trans "Global" %}
    -

    Mail Delivery:

    +

    {% trans "Mail Delivery" %}:

    - [More info{{ settingsform.delivery_status.help_text }} + [{% trans 'More info' %}{{ settingsform.delivery_status.help_text }} ]

    {{settingsform.delivery_status }}
    -

    Select a Mode of Delivery:

    +

    {% trans "Select a Mode of Delivery" %}:

    - [More info{{ settingsform.delivery_mode.help_text }} + [{% trans 'More info' %}{{ settingsform.delivery_mode.help_text }} ]

    {{settingsform.delivery_mode }}
    -

    Receive your own posts to the list?

    +

    {% trans "Receive your own posts to the list?" %}

    - [More info{{ settingsform.receive_own_postings.help_text }} + [{% trans 'More info' %}{{ settingsform.receive_own_postings.help_text }} ]

    {{settingsform.receive_own_postings }}
    -

    Receive acknowledgement mails?

    +

    {% trans "Receive acknowledgement mails?" %}

    - [More info{{ settingsform.acknowledge_posts.help_text }} + [{% trans 'More info' %}{{ settingsform.acknowledge_posts.help_text }} ]

    {{settingsform.acknowledge_posts }}
    -

    Conceal yourself from the subscriber list?

    +

    {% trans "Conceal yourself from the subscriber list?" %}

    - [More info{{ settingsform.hide_address.help_text }} + [{% trans 'More info' %}{{ settingsform.hide_address.help_text }} ]

    {{settingsform.hide_address }}
    -

    Avoid duplicate copies of messages?

    -

    [More info{{ settingsform.receive_list_copy.help_text }} +

    {% trans "Avoid duplicate copies of messages?" %}

    +

    [{% trans 'More info' %}{{ settingsform.receive_list_copy.help_text }} ]

    {{settingsform.receive_list_copy }}
    Subscription {% trans 'Subscription' %} {{field.label}}

    [More info{{ field.help_text }} +

    {{field.label}}

    [{% trans 'More info' %}{{ field.help_text }} ]