diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-01-31 18:44:09 -0500 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-02-01 19:47:41 -0500 |
| commit | 44dea29977be349304a905e01b3ec89f7bdc6168 (patch) | |
| tree | b81a817f9642a788813e7f28d80f3bef4ac6f30c /giscanner/mallardwriter.py | |
| parent | 217916ca496827aa494d956787e2700b21c66aaa (diff) | |
| download | gobject-introspection-44dea29977be349304a905e01b3ec89f7bdc6168.tar.gz | |
doctool: Rename templates to exclude mallard/the language
As templates are in their own directory and segregated into language
already, this is sort of repeating the issue. At the same time, always
explicitly use relative ("./") or absolute ("/") lookups for templates.
We want to eventually have base templates to share between languages, so
to do so without namespace clashes makes sense.
Diffstat (limited to 'giscanner/mallardwriter.py')
| -rw-r--r-- | giscanner/mallardwriter.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 2d435aa3..b00de1f4 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -463,9 +463,8 @@ class MallardWriter(object): srcdir = os.path.dirname(__file__) template_dir = os.path.join(srcdir, 'doctemplates') - language_dir = os.path.join(template_dir, self._language) - return TemplateLookup(directories=[template_dir, language_dir], + return TemplateLookup(directories=[template_dir], module_directory=tempfile.mkdtemp(), output_encoding='utf-8') @@ -496,7 +495,7 @@ class MallardWriter(object): namespace = self._transformer.namespace node_kind = get_node_kind(node) - template_name = 'mallard-%s-%s.tmpl' % (self._language, node_kind) + template_name = '%s/%s.tmpl' % (self._language, node_kind) page_id = make_page_id(node) template = self._lookup.get_template(template_name) |