unescape markup #1634
Merged
unescape markup #1634
Conversation
This file contains 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
|
🍰 Looks really nice! |
|
By the way, the only day that we do not do merges is on Fridays :-) Just to ensure a good weekend for everybody. Thus, next Monday will be merged! THANKS a lot. This is a really great and clean solution. |
|
Awesome, thank you!
Makes a lot of sense :) have a great weekend! |
KrzysztofMadejski
suggested changes
Aug 25, 2017
| '<strong><a href="https://docs.pybossa.com"> {}' + | ||
| '</a></strong> {}') | ||
| flash(markup.format( | ||
| gettext('You can check the '), |
There was a problem hiding this comment.
This should be one message, otherwise it will broken in translations files and hard to understood by translators.
| @@ -5977,7 +5977,7 @@ def test_69_allow_anonymous_contributors(self): | |||
| res = self.app.get(url, follow_redirects=True) | |||
| err_msg = "User should be redirected to sign in" | |||
| project = db.session.query(Project).first() | |||
| msg = "Oops! You have to sign in to participate in <strong>%s</strong>" % project.name | |||
| @@ -414,7 +414,7 @@ def test_12_admin_user_search_json(self): | |||
| # warning should be issued for non-found users | |||
| data = {'user': 'nothingexists'} | |||
| res = self.app_post_json('/admin/users', data=data) | |||
| warning = ("We didn't find") | |||
| warning = ("We didn't find") | |||
There was a problem hiding this comment.
Yes! Let's merge this first, and then we can fix these other issues. This solution will be the path to avoid these errors, so we can have good translations.
pybossa/view/projects.py
Outdated
| @@ -784,7 +787,8 @@ def task_presenter(short_name, task_id): | |||
| next_url = url_for('project.task_presenter', | |||
| short_name=short_name, task_id=task_id) | |||
| url = url_for('account.signin', next=next_url) | |||
| flash(msg_1 + "<a href=\"" + url + "\">Sign in now!</a>", "warning") | |||
| markup = Markup('<a href="{}">Sign in now!</a>'.format(url)) | |||
pybossa/view/admin.py
Outdated
| @@ -473,7 +478,8 @@ def delete_announcement(id): | |||
|
|
|||
| ensure_authorized_to('delete', announcement) | |||
| announcement_repo.delete(announcement) | |||
| flash('<i class="icon-ok"></i> ' + 'Announcement deleted!', 'success') | |||
| markup = '<i class="icon-ok"></i> {}' | |||
| flash(markup.format('Announcement deleted!'), 'success') | |||
pybossa/view/admin.py
Outdated
| flash("<strong>Ooops!</strong> We didn't find a user " | ||
| "matching your query: <strong>%s</strong>" % form.user.data) | ||
| markup = Markup('<strong>{}</strong> {} <strong>{}</strong>') | ||
| flash(markup.format("Ooops!", |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.