Conversation
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
Owner
Author
|
TODO list before this can be merged:
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 Also be sure that the full test suite continues to pass! |
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
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 |
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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Many thanks to @arthurlutz for spearheading this effort. This branch is for a complete i18n-capable refactor of all templates.