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 #303 from dafyddcrosby/typos

Browse source 
Fix some typos and grammar
This commit is contained in:
Kyle Fuller 2012-04-15 06:33:51 -07:00
commit 7b5b99aafa
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pelican/__init__.py
View file

@ -61,8 +61,9 @@ class Pelican(object):
def _handle_deprecation(self): def _handle_deprecation(self):
if self.settings.get('CLEAN_URLS', False): if self.settings.get('CLEAN_URLS', False):
logger.warning('Found deprecated `CLEAN_URLS` in settings. Modifing' logger.warning('Found deprecated `CLEAN_URLS` in settings. '
' the following settings for the same behaviour.') ' Modifying the following settings for the
' same behaviour.')
self.settings['ARTICLE_URL'] = '{slug}/' self.settings['ARTICLE_URL'] = '{slug}/'
self.settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/' self.settings['ARTICLE_LANG_URL'] = '{slug}-{lang}/'
@ -75,7 +76,7 @@ class Pelican(object):
if self.settings.get('ARTICLE_PERMALINK_STRUCTURE', False): if self.settings.get('ARTICLE_PERMALINK_STRUCTURE', False):
logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in' logger.warning('Found deprecated `ARTICLE_PERMALINK_STRUCTURE` in'
' settings. Modifing the following settings for' ' settings. Modifying the following settings for'
' the same behaviour.') ' the same behaviour.')
structure = self.settings['ARTICLE_PERMALINK_STRUCTURE'] structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']

4
pelican/contents.py
View file

@ -63,7 +63,7 @@ class Page(object):
self.in_default_lang = (self.lang == default_lang) self.in_default_lang = (self.lang == default_lang)
# create the slug if not existing, fro mthe title # create the slug if not existing, from the title
if not hasattr(self, 'slug') and hasattr(self, 'title'): if not hasattr(self, 'slug') and hasattr(self, 'title'):
self.slug = slugify(self.title) self.slug = slugify(self.title)
@ -135,7 +135,7 @@ class Page(object):
def _get_summary(self): def _get_summary(self):
"""Returns the summary of an article, based on the summary metadata """Returns the summary of an article, based on the summary metadata
if it is set, else troncate the content.""" if it is set, else truncate the content."""
if hasattr(self, '_summary'): if hasattr(self, '_summary'):
return self._summary return self._summary
else: else:

2
pelican/generators.py
View file

@ -351,7 +351,7 @@ class PagesGenerator(Generator):
class StaticGenerator(Generator): class StaticGenerator(Generator):
"""copy static paths (what you want to cpy, like images, medias etc. """copy static paths (what you want to copy, like images, medias etc.
to output""" to output"""
def _copy_paths(self, paths, source, destination, output_path, def _copy_paths(self, paths, source, destination, output_path,

4
pelican/tools/pelican_quickstart.py
View file

@ -202,7 +202,7 @@ def main():
print('''Welcome to pelican-quickstart v{v}. print('''Welcome to pelican-quickstart v{v}.
This script will help you creating a new Pelican based website. This script will help you create a new Pelican-based website.
Please answer the following questions so this script can generate the files needed by Pelican. Please answer the following questions so this script can generate the files needed by Pelican.
@ -211,7 +211,7 @@ Please answer the following questions so this script can generate the files need
CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new Web site ?', answer=str, default=args.path)) CONF['basedir'] = os.path.abspath(ask('Where do you want to create your new Web site ?', answer=str, default=args.path))
CONF['sitename'] = ask('How will you call your Web site ?', answer=str, default=args.title) CONF['sitename'] = ask('How will you call your Web site ?', answer=str, default=args.title)
CONF['author'] = ask('Who will be the author of this Web site ?', answer=str, default=args.author) CONF['author'] = ask('Who will be the author of this Web site ?', answer=str, default=args.author)
CONF['lang'] = ask('What will be the default language of this Web site ?', str, args.lang or CONF['lang'], 2) CONF['lang'] = ask('What will be the default language of this Web site ?', str, args.lang or CONF['lang'], 2)
CONF['with_pagination'] = ask('Do you want to enable article pagination ?', bool, bool(CONF['default_pagination'])) CONF['with_pagination'] = ask('Do you want to enable article pagination ?', bool, bool(CONF['default_pagination']))