Merge lp://staging/~sumanah/postorius/bug-1157947 into lp://staging/postorius
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 191 | ||||
Proposed branch: | lp://staging/~sumanah/postorius/bug-1157947 | ||||
Merge into: | lp://staging/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://staging/~sumanah/postorius/bug-1157947 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Florian Fuchs | Approve | ||
Terri | Pending | ||
Review via email: mp+245979@code.staging.launchpad.net |
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
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