github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #194 from kylef/clean_urls

Browse source 
Fix CLEAN_URLS and place articles in <slug>/index.html
This commit is contained in:
Alexis Metaireau 2011-12-17 10:01:07 -08:00
commit 522ac12dc9
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pelican/contents.py
View file

@ -55,10 +55,18 @@ class Page(object):
# create save_as from the slug (+lang) # create save_as from the slug (+lang)
if not hasattr(self, 'save_as') and hasattr(self, 'slug'): if not hasattr(self, 'save_as') and hasattr(self, 'slug'):
if self.in_default_lang: if self.in_default_lang:
self.save_as = '%s.html' % self.slug if settings.get('CLEAN_URLS', False):
self.save_as = '%s/index.html' % self.slug
else:
self.save_as = '%s.html' % self.slug
clean_url = '%s/' % self.slug clean_url = '%s/' % self.slug
else: else:
self.save_as = '%s-%s.html' % (self.slug, self.lang) if settings.get('CLEAN_URLS', False):
self.save_as = '%s-%s/index.html' % (self.slug, self.lang)
else:
self.save_as = '%s-%s.html' % (self.slug, self.lang)
clean_url = '%s-%s/' % (self.slug, self.lang) clean_url = '%s-%s/' % (self.slug, self.lang)
# change the save_as regarding the settings # change the save_as regarding the settings