Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I18n #27

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open

I18n #27

wants to merge 61 commits into from

Conversation

yourcelf
Copy link
Owner

Many thanks to @arthurlutz for spearheading this effort. This branch is for a complete i18n-capable refactor of all templates.

arthurlutz added 30 commits May 30, 2012 23:19
arthurlutz and others added 23 commits September 11, 2012 07:55
Conflicts:
	scanblog/templates/about/faq.html
Conflicts:
	scanblog/profiles/views.py
	scanblog/templates/_pagination.html
	scanblog/templates/about/about_base.html
	scanblog/templates/about/faq.html
	scanblog/templates/about/index.html
	scanblog/templates/about/privacy.html
	scanblog/templates/about/terms.html
	scanblog/templates/blogs/_blog_cloud.html
	scanblog/templates/blogs/_inappropriate_post.html
	scanblog/templates/blogs/_post_tag_list.html
	scanblog/templates/blogs/_post_title_line.html
	scanblog/templates/blogs/_related.html
	scanblog/templates/blogs/base.html
	scanblog/templates/blogs/blogs_front_page.html
	scanblog/templates/blogs/delete_post.html
	scanblog/templates/blogs/edit_post.html
	scanblog/templates/blogs/manage_posts.html
	scanblog/templates/blogs/page_picker.html
	scanblog/templates/blogs/post_detail.html
	scanblog/templates/btb/admin-content-flagged.txt
	scanblog/templates/btb/admin-email-comment-posted.txt
	scanblog/templates/btb/admin-email-transcription-edited.txt
	scanblog/templates/comments/_comment.html
	scanblog/templates/comments/_comment_form.html
	scanblog/templates/comments/edit_comment.html
	scanblog/templates/correspondence/base.html
	scanblog/templates/correspondence/base_letter_list.html
	scanblog/templates/correspondence/delete_letter_confirm.html
	scanblog/templates/correspondence/mass_mailing_spreadsheet.html
	scanblog/templates/correspondence/pending.html
	scanblog/templates/feeds/_all.html
	scanblog/templates/feeds/_author.html
	scanblog/templates/feeds/_comments.html
	scanblog/templates/feeds/_featured.html
	scanblog/templates/feeds/_org.html
	scanblog/templates/feeds/_subscriptions.html
	scanblog/templates/feeds/_tag.html
	scanblog/templates/home.html
	scanblog/templates/moderation/_scans.html
	scanblog/templates/moderation/manage_tasks.html
	scanblog/templates/notification/email_body.txt
	scanblog/templates/notification/notice_settings.html
	scanblog/templates/notification/notices.html
	scanblog/templates/profiles/groups_list.html
	scanblog/templates/profiles/profile_detail.html
	scanblog/templates/profiles/profile_edit.html
	scanblog/templates/registration/activate.html
	scanblog/templates/registration/activation_complete.html
	scanblog/templates/registration/login.html
	scanblog/templates/scanning/after_transcribe_comment.html
	scanblog/templates/scanning/revision_list.html
	scanblog/templates/site_base.html
	scanblog/templates/subscriptions/subscribe_to.html
Conflicts:
	scanblog/templates/about/about_base.html
	scanblog/templates/about/copyright.html
	scanblog/templates/about/legal_base.html
	scanblog/templates/blogs/_blog_cloud.html
	scanblog/templates/blogs/_post_tag_list.html
	scanblog/templates/blogs/page_picker.html
	scanblog/templates/comments/_comment_form.html
	scanblog/templates/correspondence/mass_mailing_spreadsheet.html
	scanblog/templates/feeds/_subscriptions.html
	scanblog/templates/notification/notice_settings.html
	scanblog/templates/scanning/after_transcribe_comment.html
	scanblog/templates/site_base.html
	scanblog/templates/subscriptions/subscribe_to.html
@yourcelf
Copy link
Owner Author

TODO list before this can be merged:

  • Replace atomic translations with blocktrans in the following:
    • scanblog/templates/blogs/_sharing_buttons.html
    • scanblog/templates/blogs/all_comments_list.html
    • scanblog/templates/blogs/delete_post.html
    • scanblog/templates/blogs/tag_post_list.html
    • scanblog/templates/btb/admin-content-flagged.txt
    • scanblog/templates/comments/unremove_comment.html
  • Thorough manual testing, particularly for the following less immediately visible features:
    • generated correspondence
    • comment removal notices and letters
    • posts from the web
    • affiliations, org pages, and campaigns

Also desirable but not required pre-merge would be finding and handling any strings sent by the python code, not in the templates.

Included in this branch is a simple linter, found in scanblog/templates/lint.py, which looks for many of the common errors I found in the i18n tags in the templates. Make sure this doesn't find any errors.

Also be sure that the full test suite continues to pass!

@arthurlutz
Copy link
Contributor

In scanblog/templates/blogs/_sharing_buttons.html does the script type="text/javascript" need to be on one line or can we insert line breaks for readability and adding the blocktrans ?

arthurlutz added a commit to arthurlutz/btb that referenced this pull request Nov 11, 2014
@arthurlutz
Copy link
Contributor

I'm not too sure what needs to be changed in scanblog/templates/blogs/tag_post_list.html

For the other files, I've pushed a pull request #28

@arthurlutz
Copy link
Contributor

We're going to restart work on this branch as you might see on https://github.com/arthurlutz/btb/tree/master-i18n-merge-from-i18n

any tips apart from looking at the todo list in #27 (comment) ?

ping @stoutouloutou

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants