[svn] small baker changes

--HG--
branch : trunk

diff --git a/docs/src/frameworks.txt b/docs/src/frameworks.txt
index 5efd7f031a9a21da4b77c0f8a716593487c55268..cc3eb702b65ba164d8ddbf58e9c54a0749e817a8 100644 (file)
--- a/docs/src/frameworks.txt
+++ b/docs/src/frameworks.txt
@@ -38,6 +38,17 @@ You can override this using ``jinja.exception``. eg:
         'jinja.extension': 'tmpl'
     })
 
+Note that you have to use a trailing slash to load templates if you want to
+specify the extension. Otherwise use the dotted notation:
+
+.. sourcecode:: python
+
+    render_template('/index.html')
+    render_template('index')
+    
+    render_template('/modules/userlist.html')
+    render_template('modules.userlist')
+
 
 TurboGears
 ----------

diff --git a/jinja/bakerplugin.py b/jinja/bakerplugin.py
index 81edeb9af569b8c034b62050749cfc60c5c100ba..a0525bd1b4d904fcf967ca95e2064d27171e9f9f 100644 (file)
--- a/jinja/bakerplugin.py
+++ b/jinja/bakerplugin.py
@@ -48,8 +48,10 @@ class JinjaPlugin(object):
             return self.environment.from_string(template_string)
 
         # Translate TG dot notation to normal / template path
-        if '/' not in templatename and '.' in templatename:
-            templatename = '/' + templatename.replace('.', '/') + '.' + self.extension
+        if templatename.startswith('/'):
+            templatename = templatename[1:]
+        else:
+            templatename = templatename.replace('.', '/') + '.' + self.extension
 
         return self.environment.get_template(templatename)