Fix #2930 -- specify utf-8 as default encoding for Mako

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Dec 5, 2017 · a7ede10 · a7ede10
1 parent 60e9861
commit a7ede10
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -27,6 +27,7 @@ Features
 Bugfixes
 --------
 
+* Specify UTF-8 input encoding for Mako as default (Issue #2930)
 * Don't trigger rebuilds in auto mode for files it's safe to ignore
   (Issue #2906)
 * Fix padding for Jupyter code blocks (Issue #2927)

diff --git a/docs/manual.txt b/docs/manual.txt
@@ -1272,6 +1272,8 @@ If you use the shortcode as paired, then the contents between the paired tags
 will be available in the ``data`` variable. If you want to access the Nikola
 object, it will be available as ``site``. Use with care :-)
 
+.. note:: Template-based shortcodes use the same template engine as your site’s theme.
+
 See :doc:`extending` for detailed information.
 
 For example, if your ``shortcodes/foo.tmpl`` contains this:

diff --git a/nikola/plugins/template/mako.py b/nikola/plugins/template/mako.py
@@ -93,6 +93,7 @@ def create_lookup(self):
         self.lookup = TemplateLookup(
             directories=self.directories,
             module_directory=self.cache_dir,
+            input_encoding='utf-8',
             output_encoding='utf-8')
 
     def set_site(self, site):