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

Fix #2422 #2423

Merged
merged 2 commits into from Aug 2, 2016
Merged

Fix #2422 #2423

merged 2 commits into from Aug 2, 2016

Conversation

ralsina
Copy link
Member

@ralsina ralsina commented Aug 2, 2016

Pass current language to docutils so things lik .. contents:: and admonitions are localized correctly.

'syntax_highlight': 'short',
'math_output': 'mathjax',
'template': default_template_path,
'language_code': LocaleBorg().current_lang,
Copy link
Member

@Kwpolska Kwpolska Aug 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this react to pt_BR which docutils wants as pt_br? Should we perhaps make another dict for docutils languages in LEGAL_VALUES in nikola.py?

Copy link
Member Author

@ralsina ralsina Aug 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ugh?

Copy link
Member Author

@ralsina ralsina Aug 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just checked, we also have pt_br as our translation name, so it all works out.

Copy link
Member

@Kwpolska Kwpolska Aug 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There will be warnings if a language is unsupported by docutils, but I guess we can live with that. LGTM, merge at will.

@ralsina ralsina merged commit bc93e97 into master Aug 2, 2016
3 of 4 checks passed
@ralsina ralsina deleted the fix-2422 branch Aug 2, 2016
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.

None yet

2 participants