[fix bug 1222137] Enable bedrock locale-based templates. #3880
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
|
Hm, tests are all passing locally... |
| pass | ||
|
|
||
| # Render try #2: Look for locale-specific template in app/templates/ | ||
| locale_tmpl = template.replace('.html', '.' + request.locale + '.html') |
There was a problem hiding this comment.
I think it'd be more robust to use some stdlib tools here:
>>> from os.path import splitext
>>> template = 'los-angles/laziest/dude.html'
>>> '.{}'.format('pt-BR').join(splitext(template))
'los-angles/laziest/dude.pt-BR.html'
|
Hmm. This looks good, but tests failing. Looks like an unapplied mock. Likely due to from lib import l10n_utils
@patch.object(l10n_utils, 'django_render')
class ...You'd have to change calls to |
| @@ -125,3 +127,53 @@ def test_render_no_locale(self, django_render, get_lang_path): | |||
| # Note: no .locale on request | |||
| # Should not cause an exception | |||
| render(request, '500.html') | |||
|
|
|||
|
|
|||
| @patch.object(l10n_utils, 'django_render') | |||
There was a problem hiding this comment.
We also have to patch template_is_active.
@patch('lib.l10n_utils.template_is_active', Mock(return_value=True))
@patch('lib.l10n_utils.django_render')That set of patches works for me.
jpetto
force-pushed
the
bug-1222137-locale-based-templates
branch
from
3cc15ef
to
62f0107
Compare
|
Yay! I think we're good here. Let me check one more time. |
pmclanahan
added a commit
that referenced
this pull request
Feb 19, 2016
[fix bug 1222137] Enable bedrock locale-based templates.
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.
@pmclanahan r?