Merge lp:~sumanah/postorius/bug-1157947 into lp:postorius
- bug-1157947
- Merge into trunk
Proposed by
Sumana Harihareswara
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 191 | ||||
| Proposed branch: | lp:~sumanah/postorius/bug-1157947 | ||||
| Merge into: | lp:postorius | ||||
| Diff against target: |
477 lines (+63/-63) 15 files modified
src/postorius/templates/postorius/lists/confirm_delete.html (+1/-1) src/postorius/templates/postorius/lists/held_messages.html (+1/-1) src/postorius/templates/postorius/lists/mass_subscribe.html (+1/-1) src/postorius/templates/postorius/lists/memberoptions.html (+6/-6) src/postorius/templates/postorius/lists/members.html (+5/-5) src/postorius/templates/postorius/lists/metrics.html (+1/-1) src/postorius/templates/postorius/lists/settings.html (+3/-3) src/postorius/templates/postorius/lists/summary.html (+3/-3) src/postorius/templates/postorius/login.html (+6/-6) src/postorius/templates/postorius/site_settings.html (+1/-1) src/postorius/templates/postorius/user_address_activation_sent.html (+1/-1) src/postorius/templates/postorius/user_address_preferences.html (+13/-13) src/postorius/templates/postorius/user_mailmansettings.html (+14/-14) src/postorius/templates/postorius/user_settings.html (+5/-5) src/postorius/templates/postorius/user_subscription_preferences.html (+2/-2) |
||||
| To merge this branch: | bzr merge lp:~sumanah/postorius/bug-1157947 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Florian Fuchs | Approve | ||
| Terri | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
This branch fixes bug # 1157947 by finding all user-visible occurrences of hard-coded English strings in the src/postorius/
{% trans 'English message' %}
(In this branch I also made three very trivial grammar, spelling, and capitalization fixes to the templates.)
Templates I inspected (in many cases no change was needed):
base_ajax.html
base.html
confirm_dialog.html
domain_
domain_index.html
domain_new.html
errors/
generic.html
lists/
confirm_
confirm_
held_
index.html
mass_
memberoptio
members.html
metrics.html
new.html
settings.html
subscribe.html
subscriptio
summary.html
unsubscribe
login.html
menu/
general.html
info.html
list_nav.html
maintanance
mm_
settings_
subscriptio
user_nav.html
user_
users_nav.html
more_info_
site_settings.html
user_address_
user_address_
user_address_
user_address_
user_mailmanset
user_profile.html
user_settings.html
user_subscripti
user_subscripti
user_tasks.html
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'src/postorius/templates/postorius/lists/confirm_delete.html' | |||
| 2 | --- src/postorius/templates/postorius/lists/confirm_delete.html 2013-05-31 02:21:03 +0000 | |||
| 3 | +++ src/postorius/templates/postorius/lists/confirm_delete.html 2015-01-09 16:16:31 +0000 | |||
| 4 | @@ -4,7 +4,7 @@ | |||
| 5 | 4 | {% load nav_helpers %} | 4 | {% load nav_helpers %} |
| 6 | 5 | 5 | ||
| 7 | 6 | {% block main %} | 6 | {% block main %} |
| 9 | 7 | {% list_nav 'list_delete' 'Delete List' %} | 7 | {% list_nav 'list_delete' {% trans "Delete List" %} %} |
| 10 | 8 | 8 | ||
| 11 | 9 | <p>{% trans "Are you sure you want to permanently delete this list?" %}</p> | 9 | <p>{% trans "Are you sure you want to permanently delete this list?" %}</p> |
| 12 | 10 | <p>{% trans "All settings and membership data will be lost!" %}</p> | 10 | <p>{% trans "All settings and membership data will be lost!" %}</p> |
| 13 | 11 | 11 | ||
| 14 | === modified file 'src/postorius/templates/postorius/lists/held_messages.html' | |||
| 15 | --- src/postorius/templates/postorius/lists/held_messages.html 2013-05-31 02:21:03 +0000 | |||
| 16 | +++ src/postorius/templates/postorius/lists/held_messages.html 2015-01-09 16:16:31 +0000 | |||
| 17 | @@ -6,7 +6,7 @@ | |||
| 18 | 6 | {% block body_class %}list_summary{% endblock %} | 6 | {% block body_class %}list_summary{% endblock %} |
| 19 | 7 | 7 | ||
| 20 | 8 | {% block main %} | 8 | {% block main %} |
| 22 | 9 | {% list_nav 'list_held_messages' 'Held Messages' %} | 9 | {% list_nav 'list_held_messages' {% trans "Held Messages" %} %} |
| 23 | 10 | 10 | ||
| 24 | 11 | <table class="table table-bordered table-striped"> | 11 | <table class="table table-bordered table-striped"> |
| 25 | 12 | <thead> | 12 | <thead> |
| 26 | 13 | 13 | ||
| 27 | === modified file 'src/postorius/templates/postorius/lists/mass_subscribe.html' | |||
| 28 | --- src/postorius/templates/postorius/lists/mass_subscribe.html 2013-05-31 02:21:03 +0000 | |||
| 29 | +++ src/postorius/templates/postorius/lists/mass_subscribe.html 2015-01-09 16:16:31 +0000 | |||
| 30 | @@ -4,7 +4,7 @@ | |||
| 31 | 4 | {% load nav_helpers %} | 4 | {% load nav_helpers %} |
| 32 | 5 | 5 | ||
| 33 | 6 | {% block main %} | 6 | {% block main %} |
| 35 | 7 | {% list_nav 'mass_subscribe' 'Mass Subscription' %} | 7 | {% list_nav 'mass_subscribe' {% trans "Mass Subscription" %} %} |
| 36 | 8 | 8 | ||
| 37 | 9 | <form action="{% url 'mass_subscribe' list.fqdn_listname %}" method="post" class="well"> {% csrf_token %} | 9 | <form action="{% url 'mass_subscribe' list.fqdn_listname %}" method="post" class="well"> {% csrf_token %} |
| 38 | 10 | {{ form.as_p }} | 10 | {{ form.as_p }} |
| 39 | 11 | 11 | ||
| 40 | === modified file 'src/postorius/templates/postorius/lists/memberoptions.html' | |||
| 41 | --- src/postorius/templates/postorius/lists/memberoptions.html 2014-04-22 12:49:50 +0000 | |||
| 42 | +++ src/postorius/templates/postorius/lists/memberoptions.html 2015-01-09 16:16:31 +0000 | |||
| 43 | @@ -27,7 +27,7 @@ | |||
| 44 | 27 | <td> | 27 | <td> |
| 45 | 28 | <p>{% trans 'Mail Delivery:' %} </p> | 28 | <p>{% trans 'Mail Delivery:' %} </p> |
| 46 | 29 | </p> | 29 | </p> |
| 48 | 30 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.delivery_status.help_text }} | 30 | [<span class="more_info"><a href="#" target="_blank">{% trans "More info" %}</a><span>{{ settingsform.delivery_status.help_text }} |
| 49 | 31 | </span></span>] </p> | 31 | </span></span>] </p> |
| 50 | 32 | </td> | 32 | </td> |
| 51 | 33 | <td> {{settingsform.delivery_status }} </td> | 33 | <td> {{settingsform.delivery_status }} </td> |
| 52 | @@ -36,7 +36,7 @@ | |||
| 53 | 36 | <td> | 36 | <td> |
| 54 | 37 | <p>{% trans 'Mode of Delivery:' %}</p> | 37 | <p>{% trans 'Mode of Delivery:' %}</p> |
| 55 | 38 | <p> | 38 | <p> |
| 57 | 39 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.delivery_mode.help_text }} | 39 | [<span class="more_info"><a href="#" target="_blank">{% trans "More info" %}</a><span>{{ settingsform.delivery_mode.help_text }} |
| 58 | 40 | </span></span>] </p> | 40 | </span></span>] </p> |
| 59 | 41 | </td> | 41 | </td> |
| 60 | 42 | <td> {{settingsform.delivery_mode }} </td> | 42 | <td> {{settingsform.delivery_mode }} </td> |
| 61 | @@ -45,7 +45,7 @@ | |||
| 62 | 45 | <td> | 45 | <td> |
| 63 | 46 | <p>{% trans 'Receive own posts to the list?' %}</p> | 46 | <p>{% trans 'Receive own posts to the list?' %}</p> |
| 64 | 47 | <p> | 47 | <p> |
| 66 | 48 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.receive_own_postings.help_text }} | 48 | [<span class="more_info"><a href="#" target="_blank">{% trans "More info" %}</a><span>{{ settingsform.receive_own_postings.help_text }} |
| 67 | 49 | </span></span>] </p> | 49 | </span></span>] </p> |
| 68 | 50 | </td> | 50 | </td> |
| 69 | 51 | <td> {{settingsform.receive_own_postings }} </td> | 51 | <td> {{settingsform.receive_own_postings }} </td> |
| 70 | @@ -54,7 +54,7 @@ | |||
| 71 | 54 | <td> | 54 | <td> |
| 72 | 55 | <p>{% trans 'Receive acknowledgement mails?' %}</p> | 55 | <p>{% trans 'Receive acknowledgement mails?' %}</p> |
| 73 | 56 | </p> | 56 | </p> |
| 75 | 57 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.acknowledge_posts.help_text }} | 57 | [<span class="more_info"><a href="#" target="_blank">{% trans "More info" %}</a><span>{{ settingsform.acknowledge_posts.help_text }} |
| 76 | 58 | </span></span>] </p> | 58 | </span></span>] </p> |
| 77 | 59 | </td> | 59 | </td> |
| 78 | 60 | <td> {{settingsform.acknowledge_posts }} </td> | 60 | <td> {{settingsform.acknowledge_posts }} </td> |
| 79 | @@ -63,7 +63,7 @@ | |||
| 80 | 63 | <td> | 63 | <td> |
| 81 | 64 | <p>{% trans 'Conceal address from the subscriber list?' %}</p> | 64 | <p>{% trans 'Conceal address from the subscriber list?' %}</p> |
| 82 | 65 | </p> | 65 | </p> |
| 84 | 66 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.hide_address.help_text }} | 66 | [<span class="more_info"><a href="#" target="_blank">{% trans "More info" %}</a><span>{{ settingsform.hide_address.help_text }} |
| 85 | 67 | </span></span>] </p> | 67 | </span></span>] </p> |
| 86 | 68 | </td> | 68 | </td> |
| 87 | 69 | <td> {{settingsform.hide_address }} </td> | 69 | <td> {{settingsform.hide_address }} </td> |
| 88 | @@ -71,7 +71,7 @@ | |||
| 89 | 71 | <tr> | 71 | <tr> |
| 90 | 72 | <td> | 72 | <td> |
| 91 | 73 | <p>{% trans 'Avoid duplicate copies of messages? ' %}</p> | 73 | <p>{% trans 'Avoid duplicate copies of messages? ' %}</p> |
| 93 | 74 | </p> [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.receive_list_copy.help_text }} | 74 | </p> [<span class="more_info"><a href="#" target="_blank">{% trans "More info" %}</a><span>{{ settingsform.receive_list_copy.help_text }} |
| 94 | 75 | </span></span>] </p> | 75 | </span></span>] </p> |
| 95 | 76 | </td> | 76 | </td> |
| 96 | 77 | <td> {{settingsform.receive_list_copy }} </td> | 77 | <td> {{settingsform.receive_list_copy }} </td> |
| 97 | 78 | 78 | ||
| 98 | === modified file 'src/postorius/templates/postorius/lists/members.html' | |||
| 99 | --- src/postorius/templates/postorius/lists/members.html 2014-04-22 12:49:50 +0000 | |||
| 100 | +++ src/postorius/templates/postorius/lists/members.html 2015-01-09 16:16:31 +0000 | |||
| 101 | @@ -4,7 +4,7 @@ | |||
| 102 | 4 | {% load nav_helpers %} | 4 | {% load nav_helpers %} |
| 103 | 5 | 5 | ||
| 104 | 6 | {% block main %} | 6 | {% block main %} |
| 106 | 7 | {% list_nav 'list_members' 'List Members' %} | 7 | {% list_nav 'list_members' {% trans "List Members" %} %} |
| 107 | 8 | 8 | ||
| 108 | 9 | <h2>{% trans "Owners" %}</h2> | 9 | <h2>{% trans "Owners" %}</h2> |
| 109 | 10 | 10 | ||
| 110 | @@ -12,7 +12,7 @@ | |||
| 111 | 12 | <form action="{% url 'list_members' list.fqdn_listname %}" method="POST" class="form-inline">{% csrf_token %} | 12 | <form action="{% url 'list_members' list.fqdn_listname %}" method="POST" class="form-inline">{% csrf_token %} |
| 112 | 13 | <label for="id_email">{% trans 'Email Address' %}</label> | 13 | <label for="id_email">{% trans 'Email Address' %}</label> |
| 113 | 14 | {{ owner_form.owner_email }} | 14 | {{ owner_form.owner_email }} |
| 115 | 15 | <button type="submit" class="btn">Add Owner</button> | 15 | <button type="submit" class="btn">{% trans 'Add Owner' %}</button> |
| 116 | 16 | </form> | 16 | </form> |
| 117 | 17 | <table class="table table-bordered table-striped"> | 17 | <table class="table table-bordered table-striped"> |
| 118 | 18 | <thead> | 18 | <thead> |
| 119 | @@ -26,7 +26,7 @@ | |||
| 120 | 26 | <tr> | 26 | <tr> |
| 121 | 27 | <td>{{ member }}</td> | 27 | <td>{{ member }}</td> |
| 122 | 28 | <td> | 28 | <td> |
| 124 | 29 | <a href="{% url 'remove_role' list.fqdn_listname 'owner' member %}" class="btn btn-mini btn-danger">Delete</a> | 29 | <a href="{% url 'remove_role' list.fqdn_listname 'owner' member %}" class="btn btn-mini btn-danger">{% trans 'Delete' %}</a> |
| 125 | 30 | </td> | 30 | </td> |
| 126 | 31 | </tr> | 31 | </tr> |
| 127 | 32 | {% endfor %} | 32 | {% endfor %} |
| 128 | @@ -38,7 +38,7 @@ | |||
| 129 | 38 | <form action="{% url 'list_members' list.fqdn_listname %}" method="POST" class="form-inline">{% csrf_token %} | 38 | <form action="{% url 'list_members' list.fqdn_listname %}" method="POST" class="form-inline">{% csrf_token %} |
| 130 | 39 | <label for="bla">{% trans 'Email Address' %}</label> | 39 | <label for="bla">{% trans 'Email Address' %}</label> |
| 131 | 40 | {{ moderator_form.moderator_email }} | 40 | {{ moderator_form.moderator_email }} |
| 133 | 41 | <button type="submit" class="btn">Add Moderator</button> | 41 | <button type="submit" class="btn">{% trans 'Add Moderator' %}</button> |
| 134 | 42 | </form> | 42 | </form> |
| 135 | 43 | 43 | ||
| 136 | 44 | <table class="table table-bordered table-striped"> | 44 | <table class="table table-bordered table-striped"> |
| 137 | @@ -53,7 +53,7 @@ | |||
| 138 | 53 | <tr> | 53 | <tr> |
| 139 | 54 | <td>{{ member }}</td> | 54 | <td>{{ member }}</td> |
| 140 | 55 | <td> | 55 | <td> |
| 142 | 56 | <a href="{% url 'remove_role' list.fqdn_listname 'moderator' member %}" class="btn btn-mini btn-danger">Delete</a> | 56 | <a href="{% url 'remove_role' list.fqdn_listname 'moderator' member %}" class="btn btn-mini btn-danger">{% trans 'Delete' %}</a> |
| 143 | 57 | </td> | 57 | </td> |
| 144 | 58 | </tr> | 58 | </tr> |
| 145 | 59 | {% endfor %} | 59 | {% endfor %} |
| 146 | 60 | 60 | ||
| 147 | === modified file 'src/postorius/templates/postorius/lists/metrics.html' | |||
| 148 | --- src/postorius/templates/postorius/lists/metrics.html 2013-05-31 02:21:03 +0000 | |||
| 149 | +++ src/postorius/templates/postorius/lists/metrics.html 2015-01-09 16:16:31 +0000 | |||
| 150 | @@ -4,7 +4,7 @@ | |||
| 151 | 4 | {% load nav_helpers %} | 4 | {% load nav_helpers %} |
| 152 | 5 | 5 | ||
| 153 | 6 | {% block main %} | 6 | {% block main %} |
| 155 | 7 | {% list_nav 'list_metrics' 'Metrics' %} | 7 | {% list_nav 'list_metrics' {% trans 'Metrics' %} %} |
| 156 | 8 | 8 | ||
| 157 | 9 | <table class="table table-bordered table-striped mm_userData"> | 9 | <table class="table table-bordered table-striped mm_userData"> |
| 158 | 10 | <tbody> | 10 | <tbody> |
| 159 | 11 | 11 | ||
| 160 | === modified file 'src/postorius/templates/postorius/lists/settings.html' | |||
| 161 | --- src/postorius/templates/postorius/lists/settings.html 2014-04-14 19:54:42 +0000 | |||
| 162 | +++ src/postorius/templates/postorius/lists/settings.html 2015-01-09 16:16:31 +0000 | |||
| 163 | @@ -5,7 +5,7 @@ | |||
| 164 | 5 | 5 | ||
| 165 | 6 | {% block main %} | 6 | {% block main %} |
| 166 | 7 | {% if message %}<p class="alert">{{ message }}</p>{% endif %} | 7 | {% if message %}<p class="alert">{{ message }}</p>{% endif %} |
| 168 | 8 | {% list_nav 'list_settings' 'Settings' %} | 8 | {% list_nav 'list_settings' {% trans 'Settings' %} %} |
| 169 | 9 | <ul class="nav nav-tabs"> | 9 | <ul class="nav nav-tabs"> |
| 170 | 10 | {% for section in form_sections %} | 10 | {% for section in form_sections %} |
| 171 | 11 | <li {% if section.0 == visible_section %}class="active"{% endif %}><a href="{% url 'list_settings' fqdn_listname=list.fqdn_listname visible_section=section.0 visible_option=None %}">{{section.0}}</a></li> | 11 | <li {% if section.0 == visible_section %}class="active"{% endif %}><a href="{% url 'list_settings' fqdn_listname=list.fqdn_listname visible_section=section.0 visible_option=None %}">{{section.0}}</a></li> |
| 172 | @@ -20,12 +20,12 @@ | |||
| 173 | 20 | <tr><td> | 20 | <tr><td> |
| 174 | 21 | {{ field.errors }} | 21 | {{ field.errors }} |
| 175 | 22 | {{ field.label_tag }} <br /> | 22 | {{ field.label_tag }} <br /> |
| 177 | 23 | [<span class="more_info"><a href="{% url 'more_info_tab' formid='list_settings' helpid=field.name %}" target="_blank">More info</a><span>{{ field.help_text }} | 23 | [<span class="more_info"><a href="{% url 'more_info_tab' formid='list_settings' helpid=field.name %}" target="_blank">{% trans "More info" %}</a><span>{{ field.help_text }} |
| 178 | 24 | </span></span>] | 24 | </span></span>] |
| 179 | 25 | </td><td>{{ field }}</td></tr> | 25 | </td><td>{{ field }}</td></tr> |
| 180 | 26 | {% endfor %} | 26 | {% endfor %} |
| 181 | 27 | <tr><td colspan="2"> | 27 | <tr><td colspan="2"> |
| 183 | 28 | <button class="btn btn-primary" type="submit">{%trans "Save changes" %}</button> | 28 | <button class="btn btn-primary" type="submit">{% trans "Save changes" %}</button> |
| 184 | 29 | </td></tr> | 29 | </td></tr> |
| 185 | 30 | </form> | 30 | </form> |
| 186 | 31 | </table> | 31 | </table> |
| 187 | 32 | 32 | ||
| 188 | === modified file 'src/postorius/templates/postorius/lists/summary.html' | |||
| 189 | --- src/postorius/templates/postorius/lists/summary.html 2014-03-21 14:22:57 +0000 | |||
| 190 | +++ src/postorius/templates/postorius/lists/summary.html 2015-01-09 16:16:31 +0000 | |||
| 191 | @@ -17,7 +17,7 @@ | |||
| 192 | 17 | 17 | ||
| 193 | 18 | {% if user.is_authenticated %} | 18 | {% if user.is_authenticated %} |
| 194 | 19 | {% if userSubscribed %} | 19 | {% if userSubscribed %} |
| 196 | 20 | <a href="{% url 'list_unsubscribe' list.fqdn_listname user.email %}" class="btn btn-danger">Unsubscribe</a> | 20 | <a href="{% url 'list_unsubscribe' list.fqdn_listname user.email %}" class="btn btn-danger">{% trans "Unsubscribe" %}</a> |
| 197 | 21 | {% else %} | 21 | {% else %} |
| 198 | 22 | <h2>{% trans 'Subscribe to this list' %}</h2> | 22 | <h2>{% trans 'Subscribe to this list' %}</h2> |
| 199 | 23 | <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %} | 23 | <form action="{% url 'list_subscribe' list.fqdn_listname %}" method="post" class="list_subscribe"> {% csrf_token %} |
| 200 | @@ -26,7 +26,7 @@ | |||
| 201 | 26 | </form> | 26 | </form> |
| 202 | 27 | {% endif %} | 27 | {% endif %} |
| 203 | 28 | {% else %} | 28 | {% else %} |
| 206 | 29 | <p>To subscribe or unsubscribe this list you have to be logged in.</p> | 29 | <p>{% trans "To subscribe to or unsubscribe from this list you have to be logged in." %}</p> |
| 207 | 30 | <p><a href="{% url 'user_login' %}"class="btn btn-primary">Log In</a></p> | 30 | <p><a href="{% url 'user_login' %}"class="btn btn-primary">{% trans "Log In" %}</a></p> |
| 208 | 31 | {% endif %} | 31 | {% endif %} |
| 209 | 32 | {% endblock %} | 32 | {% endblock %} |
| 210 | 33 | 33 | ||
| 211 | === modified file 'src/postorius/templates/postorius/login.html' | |||
| 212 | --- src/postorius/templates/postorius/login.html 2014-04-14 15:25:26 +0000 | |||
| 213 | +++ src/postorius/templates/postorius/login.html 2015-01-09 16:16:31 +0000 | |||
| 214 | @@ -5,7 +5,7 @@ | |||
| 215 | 5 | {% block main %} | 5 | {% block main %} |
| 216 | 6 | 6 | ||
| 217 | 7 | <div id="container"> | 7 | <div id="container"> |
| 219 | 8 | <p><strong>Login with username and password or with Mozilla Persona</strong></p> | 8 | <p><strong>{% trans "Login with username and password or with Mozilla Persona" %}</strong></p> |
| 220 | 9 | 9 | ||
| 221 | 10 | <div class="mm_login"> | 10 | <div class="mm_login"> |
| 222 | 11 | <form action="" method="post" class="login mm_clear well"> {% csrf_token %} | 11 | <form action="" method="post" class="login mm_clear well"> {% csrf_token %} |
| 223 | @@ -19,13 +19,13 @@ | |||
| 224 | 19 | <div class="mm_login_b"> | 19 | <div class="mm_login_b"> |
| 225 | 20 | <form method="post" action="{% url 'socialauth_complete' "browserid" %}"> {% csrf_token %} | 20 | <form method="post" action="{% url 'socialauth_complete' "browserid" %}"> {% csrf_token %} |
| 226 | 21 | <input type="hidden" name="assertion" value="" /> | 21 | <input type="hidden" name="assertion" value="" /> |
| 228 | 22 | <a rel="nofollow" id="browserid" href="#"><img src="{% static 'postorius/img/sign_in_blue.png' %}" alt="Login using BrowserID" /></a> | 22 | <a rel="nofollow" id="browserid" href="#"><img src="{% static 'postorius/img/sign_in_blue.png' %}" alt="{% trans 'Login using BrowserID' %}" /></a> |
| 229 | 23 | </form> | 23 | </form> |
| 231 | 24 | <p>Mozilla Persona is an easy way to sign into multiple websites, while | 24 | <p>{% trans "Mozilla Persona is an easy way to sign into multiple websites, while |
| 232 | 25 | still controlling your personal data. For more information <a | 25 | still controlling your personal data. For more information <a |
| 236 | 26 | href="http://www.mozilla.org/en-US/persona">see the mozilla website</a>.</p> | 26 | href='http://www.mozilla.org/en-US/persona'>see the Mozilla website</a>" %}.</p> |
| 237 | 27 | <noscript><p class="text-error">Mozilla Persona requires the use of | 27 | <noscript><p class="text-error">{% trans "Mozilla Persona requires the use of |
| 238 | 28 | JavaScript.</p></noscript> | 28 | JavaScript." %}</p></noscript> |
| 239 | 29 | </div> | 29 | </div> |
| 240 | 30 | <div style="clear:both"> | 30 | <div style="clear:both"> |
| 241 | 31 | </div> | 31 | </div> |
| 242 | 32 | 32 | ||
| 243 | === modified file 'src/postorius/templates/postorius/site_settings.html' | |||
| 244 | --- src/postorius/templates/postorius/site_settings.html 2013-05-31 02:21:03 +0000 | |||
| 245 | +++ src/postorius/templates/postorius/site_settings.html 2015-01-09 16:16:31 +0000 | |||
| 246 | @@ -3,5 +3,5 @@ | |||
| 247 | 3 | 3 | ||
| 248 | 4 | {% block main %} | 4 | {% block main %} |
| 249 | 5 | {% include 'postorius/menu/settings_nav.html' %} | 5 | {% include 'postorius/menu/settings_nav.html' %} |
| 251 | 6 | <h1>General Settings</h1> | 6 | <h1>{% trans "General Settings" %}</h1> |
| 252 | 7 | {% endblock main %} | 7 | {% endblock main %} |
| 253 | 8 | 8 | ||
| 254 | === modified file 'src/postorius/templates/postorius/user_address_activation_sent.html' | |||
| 255 | --- src/postorius/templates/postorius/user_address_activation_sent.html 2014-04-17 22:05:24 +0000 | |||
| 256 | +++ src/postorius/templates/postorius/user_address_activation_sent.html 2015-01-09 16:16:31 +0000 | |||
| 257 | @@ -5,6 +5,6 @@ | |||
| 258 | 5 | {% include 'postorius/menu/user_nav.html' %} | 5 | {% include 'postorius/menu/user_nav.html' %} |
| 259 | 6 | 6 | ||
| 260 | 7 | <h1>{% trans 'Email address activation sent' %}</h1> | 7 | <h1>{% trans 'Email address activation sent' %}</h1> |
| 262 | 8 | <p>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.</p> | 8 | <p>{% 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." %}</p> |
| 263 | 9 | {% endblock main %} | 9 | {% endblock main %} |
| 264 | 10 | 10 | ||
| 265 | 11 | 11 | ||
| 266 | === modified file 'src/postorius/templates/postorius/user_address_preferences.html' | |||
| 267 | --- src/postorius/templates/postorius/user_address_preferences.html 2013-10-22 18:52:15 +0000 | |||
| 268 | +++ src/postorius/templates/postorius/user_address_preferences.html 2015-01-09 16:16:31 +0000 | |||
| 269 | @@ -21,7 +21,7 @@ | |||
| 270 | 21 | <table class="table table-bordered table-striped" border = "2"> | 21 | <table class="table table-bordered table-striped" border = "2"> |
| 271 | 22 | <thead> | 22 | <thead> |
| 272 | 23 | <tr> | 23 | <tr> |
| 274 | 24 | <th> Preferences </th> | 24 | <th> {% trans 'Preferences' %} </th> |
| 275 | 25 | {% for form,address in zipped_data %} | 25 | {% for form,address in zipped_data %} |
| 276 | 26 | <th> {{address}} </th> | 26 | <th> {{address}} </th> |
| 277 | 27 | {% endfor %} | 27 | {% endfor %} |
| 278 | @@ -29,8 +29,8 @@ | |||
| 279 | 29 | </thead > | 29 | </thead > |
| 280 | 30 | <tr> | 30 | <tr> |
| 281 | 31 | <td> | 31 | <td> |
| 284 | 32 | <p>Mail Delivery: </p> | 32 | <p>{% trans 'Mail Delivery' %}: </p> |
| 285 | 33 | <p>[<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ helperform.delivery_status.help_text }} | 33 | <p>[<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ helperform.delivery_status.help_text }} |
| 286 | 34 | </span></span>] | 34 | </span></span>] |
| 287 | 35 | </p> | 35 | </p> |
| 288 | 36 | </td> | 36 | </td> |
| 289 | @@ -40,8 +40,8 @@ | |||
| 290 | 40 | </tr> | 40 | </tr> |
| 291 | 41 | <tr> | 41 | <tr> |
| 292 | 42 | <td> | 42 | <td> |
| 295 | 43 | <p> Select a Mode of Delivery: </p> | 43 | <p> {% trans 'Select a Mode of Delivery' %}: </p> |
| 296 | 44 | <p>[<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ helperform.delivery_mode.help_text }} | 44 | <p>[<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ helperform.delivery_mode.help_text }} |
| 297 | 45 | </span></span>] | 45 | </span></span>] |
| 298 | 46 | </p> | 46 | </p> |
| 299 | 47 | </td> | 47 | </td> |
| 300 | @@ -51,8 +51,8 @@ | |||
| 301 | 51 | </tr> | 51 | </tr> |
| 302 | 52 | <tr> | 52 | <tr> |
| 303 | 53 | <td> | 53 | <td> |
| 306 | 54 | <p> Receive your own posts to the list? </p> | 54 | <p> {% trans 'Receive your own posts to the list?' %} </p> |
| 307 | 55 | <p>[<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ helperform.receive_own_postings.help_text }} | 55 | <p>[<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ helperform.receive_own_postings.help_text }} |
| 308 | 56 | </span></span>] | 56 | </span></span>] |
| 309 | 57 | </p> | 57 | </p> |
| 310 | 58 | </td> | 58 | </td> |
| 311 | @@ -62,8 +62,8 @@ | |||
| 312 | 62 | </tr> | 62 | </tr> |
| 313 | 63 | <tr> | 63 | <tr> |
| 314 | 64 | <td> | 64 | <td> |
| 317 | 65 | <p> Receive acknowledgement mails? </p> | 65 | <p> {% trans 'Receive acknowledgement mails?' %} </p> |
| 318 | 66 | <p>[<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ helperform.acknowledge_posts.help_text }} | 66 | <p>[<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ helperform.acknowledge_posts.help_text }} |
| 319 | 67 | </span></span>] | 67 | </span></span>] |
| 320 | 68 | </p> | 68 | </p> |
| 321 | 69 | </td> | 69 | </td> |
| 322 | @@ -73,8 +73,8 @@ | |||
| 323 | 73 | </tr> | 73 | </tr> |
| 324 | 74 | <tr> | 74 | <tr> |
| 325 | 75 | <td> | 75 | <td> |
| 328 | 76 | <p> Conceal yourself from the subscriber list? </p> | 76 | <p> {% trans 'Conceal yourself from the subscriber list?' %} </p> |
| 329 | 77 | <p>[<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ helperform.hide_address.help_text }} | 77 | <p>[<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ helperform.hide_address.help_text }} |
| 330 | 78 | </span></span>] | 78 | </span></span>] |
| 331 | 79 | </p> | 79 | </p> |
| 332 | 80 | </td> | 80 | </td> |
| 333 | @@ -84,8 +84,8 @@ | |||
| 334 | 84 | </tr> | 84 | </tr> |
| 335 | 85 | <tr> | 85 | <tr> |
| 336 | 86 | <td> | 86 | <td> |
| 339 | 87 | <p> Avoid duplicate copies of messages? </p> | 87 | <p> {% trans 'Avoid duplicate copies of messages?' %} </p> |
| 340 | 88 | <p>[<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ helperform.receive_list_copy.help_text }} | 88 | <p>[<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ helperform.receive_list_copy.help_text }} |
| 341 | 89 | </span></span>] | 89 | </span></span>] |
| 342 | 90 | </p> | 90 | </p> |
| 343 | 91 | </td> | 91 | </td> |
| 344 | 92 | 92 | ||
| 345 | === modified file 'src/postorius/templates/postorius/user_mailmansettings.html' | |||
| 346 | --- src/postorius/templates/postorius/user_mailmansettings.html 2013-10-22 18:52:15 +0000 | |||
| 347 | +++ src/postorius/templates/postorius/user_mailmansettings.html 2015-01-09 16:16:31 +0000 | |||
| 348 | @@ -19,59 +19,59 @@ | |||
| 349 | 19 | <table class="table table-bordered table-striped" border="2"> | 19 | <table class="table table-bordered table-striped" border="2"> |
| 350 | 20 | <thead> | 20 | <thead> |
| 351 | 21 | <tr> | 21 | <tr> |
| 354 | 22 | <th> Preferences </th> | 22 | <th> {% trans "Preferences" %} </th> |
| 355 | 23 | <th> Global </th> | 23 | <th> {% trans "Global" %} </th> |
| 356 | 24 | </tr> | 24 | </tr> |
| 357 | 25 | </thead > | 25 | </thead > |
| 358 | 26 | <tr> | 26 | <tr> |
| 359 | 27 | <td> | 27 | <td> |
| 361 | 28 | <p > Mail Delivery: </p> | 28 | <p> {% trans "Mail Delivery" %}: </p> |
| 362 | 29 | </p> | 29 | </p> |
| 364 | 30 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.delivery_status.help_text }} | 30 | [<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ settingsform.delivery_status.help_text }} |
| 365 | 31 | </span></span>] </p> | 31 | </span></span>] </p> |
| 366 | 32 | </td> | 32 | </td> |
| 367 | 33 | <td> {{settingsform.delivery_status }} </td> | 33 | <td> {{settingsform.delivery_status }} </td> |
| 368 | 34 | </tr> | 34 | </tr> |
| 369 | 35 | <tr> | 35 | <tr> |
| 370 | 36 | <td> | 36 | <td> |
| 372 | 37 | <p> Select a Mode of Delivery: </p> | 37 | <p> {% trans "Select a Mode of Delivery" %}: </p> |
| 373 | 38 | </p> | 38 | </p> |
| 375 | 39 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.delivery_mode.help_text }} | 39 | [<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ settingsform.delivery_mode.help_text }} |
| 376 | 40 | </span></span>] </p> | 40 | </span></span>] </p> |
| 377 | 41 | </td> | 41 | </td> |
| 378 | 42 | <td> {{settingsform.delivery_mode }} </td> | 42 | <td> {{settingsform.delivery_mode }} </td> |
| 379 | 43 | </tr> | 43 | </tr> |
| 380 | 44 | <tr> | 44 | <tr> |
| 381 | 45 | <td> | 45 | <td> |
| 383 | 46 | <p > Receive your own posts to the list? </p> | 46 | <p> {% trans "Receive your own posts to the list?" %} </p> |
| 384 | 47 | </p> | 47 | </p> |
| 386 | 48 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.receive_own_postings.help_text }} | 48 | [<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ settingsform.receive_own_postings.help_text }} |
| 387 | 49 | </span></span>] </p> | 49 | </span></span>] </p> |
| 388 | 50 | </td> | 50 | </td> |
| 389 | 51 | <td> {{settingsform.receive_own_postings }} </td> | 51 | <td> {{settingsform.receive_own_postings }} </td> |
| 390 | 52 | </tr> | 52 | </tr> |
| 391 | 53 | <tr> | 53 | <tr> |
| 392 | 54 | <td> | 54 | <td> |
| 394 | 55 | <p > Receive acknowledgement mails? </p> | 55 | <p> {% trans "Receive acknowledgement mails?" %} </p> |
| 395 | 56 | </p> | 56 | </p> |
| 397 | 57 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.acknowledge_posts.help_text }} | 57 | [<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ settingsform.acknowledge_posts.help_text }} |
| 398 | 58 | </span></span>] </p> | 58 | </span></span>] </p> |
| 399 | 59 | </td> | 59 | </td> |
| 400 | 60 | <td> {{settingsform.acknowledge_posts }} </td> | 60 | <td> {{settingsform.acknowledge_posts }} </td> |
| 401 | 61 | </tr> | 61 | </tr> |
| 402 | 62 | <tr> | 62 | <tr> |
| 403 | 63 | <td> | 63 | <td> |
| 405 | 64 | <p>Conceal yourself from the subscriber list? </p> | 64 | <p>{% trans "Conceal yourself from the subscriber list?" %} </p> |
| 406 | 65 | </p> | 65 | </p> |
| 408 | 66 | [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.hide_address.help_text }} | 66 | [<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ settingsform.hide_address.help_text }} |
| 409 | 67 | </span></span>] </p> | 67 | </span></span>] </p> |
| 410 | 68 | </td> | 68 | </td> |
| 411 | 69 | <td> {{settingsform.hide_address }} </td> | 69 | <td> {{settingsform.hide_address }} </td> |
| 412 | 70 | </tr> | 70 | </tr> |
| 413 | 71 | <tr> | 71 | <tr> |
| 414 | 72 | <td> | 72 | <td> |
| 417 | 73 | <p >Avoid duplicate copies of messages?</p> | 73 | <p>{% trans "Avoid duplicate copies of messages?" %}</p> |
| 418 | 74 | </p> [<span class="more_info"><a href="#" target="_blank">More info</a><span>{{ settingsform.receive_list_copy.help_text }} | 74 | </p> [<span class="more_info"><a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ settingsform.receive_list_copy.help_text }} |
| 419 | 75 | </span></span>] </p> | 75 | </span></span>] </p> |
| 420 | 76 | </td> | 76 | </td> |
| 421 | 77 | <td> {{settingsform.receive_list_copy }} </td> | 77 | <td> {{settingsform.receive_list_copy }} </td> |
| 422 | 78 | 78 | ||
| 423 | === modified file 'src/postorius/templates/postorius/user_settings.html' | |||
| 424 | --- src/postorius/templates/postorius/user_settings.html 2013-05-31 02:21:03 +0000 | |||
| 425 | +++ src/postorius/templates/postorius/user_settings.html 2015-01-09 16:16:31 +0000 | |||
| 426 | @@ -5,7 +5,7 @@ | |||
| 427 | 5 | 5 | ||
| 428 | 6 | {% block main %} | 6 | {% block main %} |
| 429 | 7 | {% include 'postorius/menu/user_nav.html' %} | 7 | {% include 'postorius/menu/user_nav.html' %} |
| 431 | 8 | <h1>Membership</h1> | 8 | <h1>{% trans "Membership" %}</h1> |
| 432 | 9 | {% ifequal tab "membership"%} | 9 | {% ifequal tab "membership"%} |
| 433 | 10 | {% trans "Membership Settings" %} | 10 | {% trans "Membership Settings" %} |
| 434 | 11 | {% if list %}<span>{% trans "for"%}{% endif %} {{ list.fqdn_listname }}</span> | 11 | {% if list %}<span>{% trans "for"%}{% endif %} {{ list.fqdn_listname }}</span> |
| 435 | @@ -17,7 +17,7 @@ | |||
| 436 | 17 | <div class="mm_boxHeader"> | 17 | <div class="mm_boxHeader"> |
| 437 | 18 | {% trans "Content" %} | 18 | {% trans "Content" %} |
| 438 | 19 | </div> | 19 | </div> |
| 440 | 20 | <p>{%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 <a href='https://bugs.launchpad.net/mailman/+bug/821438' >LP:821438</a> is solved <br>" %}</p> | 20 | <p>{% 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 <a href='https://bugs.launchpad.net/mailman/+bug/821438' >LP:821438</a> is solved <br>" %}</p> |
| 441 | 21 | {% if form %} | 21 | {% if form %} |
| 442 | 22 | <form action="" method="post" class="user" name="user"> {% csrf_token %} | 22 | <form action="" method="post" class="user" name="user"> {% csrf_token %} |
| 443 | 23 | <ul class=""> | 23 | <ul class=""> |
| 444 | @@ -39,14 +39,14 @@ | |||
| 445 | 39 | {% for list in membership_lists %} | 39 | {% for list in membership_lists %} |
| 446 | 40 | <div class="mm_box mm_smallBox {% cycle 'mm_clear' '' %}"> | 40 | <div class="mm_box mm_smallBox {% cycle 'mm_clear' '' %}"> |
| 447 | 41 | <div class="mm_boxHeader"> | 41 | <div class="mm_boxHeader"> |
| 449 | 42 | <a href="{% url 'list_summary' fqdn_listname=list.fqdn_listname%}"> | 42 | <a href="{% url 'list_summary' fqdn_listname=list.fqdn_listname %}"> |
| 450 | 43 | {{ list.display_name }} {% if not list.settings.advertised %}(non-public){% endif %} | 43 | {{ list.display_name }} {% if not list.settings.advertised %}(non-public){% endif %} |
| 451 | 44 | </a> | 44 | </a> |
| 452 | 45 | </div> | 45 | </div> |
| 453 | 46 | <ul> | 46 | <ul> |
| 455 | 47 | <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname%}"> My Membership</li> | 47 | <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname%}"> {% trans "My Membership" %}</li> |
| 456 | 48 | <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname %}"> | 48 | <li><a href="{% url 'membership_settings' fqdn_listname=list.fqdn_listname %}"> |
| 458 | 49 | My Subscription</a></li> | 49 | {% trans "My Subscription" %}</a></li> |
| 459 | 50 | </ul> | 50 | </ul> |
| 460 | 51 | </div> | 51 | </div> |
| 461 | 52 | {% endfor %} | 52 | {% endfor %} |
| 462 | 53 | 53 | ||
| 463 | === modified file 'src/postorius/templates/postorius/user_subscription_preferences.html' | |||
| 464 | --- src/postorius/templates/postorius/user_subscription_preferences.html 2013-10-22 18:52:15 +0000 | |||
| 465 | +++ src/postorius/templates/postorius/user_subscription_preferences.html 2015-01-09 16:16:31 +0000 | |||
| 466 | @@ -23,9 +23,9 @@ | |||
| 467 | 23 | {% if forloop.first %} | 23 | {% if forloop.first %} |
| 468 | 24 | <thead> | 24 | <thead> |
| 469 | 25 | <tr> | 25 | <tr> |
| 471 | 26 | <th> Subscription </th> | 26 | <th> {% trans 'Subscription' %} </th> |
| 472 | 27 | {% for field in form.visible_fields %} | 27 | {% for field in form.visible_fields %} |
| 474 | 28 | <th>{{field.label}} <p><span class="more_info">[<a href="#" target="_blank">More info</a><span>{{ field.help_text }} | 28 | <th>{{field.label}} <p><span class="more_info">[<a href="#" target="_blank">{% trans 'More info' %}</a><span>{{ field.help_text }} |
| 475 | 29 | </span>]</span></p></th> | 29 | </span>]</span></p></th> |
| 476 | 30 | {% endfor %} | 30 | {% endfor %} |
| 477 | 31 | </tr > | 31 | </tr > |
Hi Sumana,
thanks so much for all the template fixes! I just merged them into the main branch (Rev. 191).
Just one little thing: The untransated string in the "{% list nav ... %} calls were correct (these string are translated in the list_nav template tag.
Thank you very much again! Now on to your next merge proposal...
Florian