Merge lp://staging/~sumanah/postorius/bug-1157947 into lp://staging/postorius

Proposed by Sumana Harihareswara
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
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/templates/postorius/ directory and templatizing them as follows:

  {% 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_confirm_delete.html
domain_index.html
domain_new.html
errors/
    generic.html
lists/
    confirm_delete.html
    confirm_remove_role.html
    held_messages.html
    index.html
    mass_subscribe.html
    memberoptions.html
    members.html
    metrics.html
    new.html
    settings.html
    subscribe.html
    subscriptions.html
    summary.html
    unsubscribe.html
login.html
menu/
    general.html
    info.html
    list_nav.html
    maintanance.html
    mm_user_nav.html
    settings_nav.html
    subscriptions.html
    user_nav.html
    user_options.html
    users_nav.html
more_info_display.html
site_settings.html
user_address_activation.html
user_address_activation_link.html
user_address_activation_sent.html
user_address_preferences.html
user_mailmansettings.html
user_profile.html
user_settings.html
user_subscription_preferences.html
user_subscriptions.html
user_tasks.html

To post a comment you must log in.
Revision history for this message
Florian Fuchs (flo-fuchs) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches