diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2013-02-27 09:13:24 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2013-02-27 09:13:24 -0300 |
| commit | 878ba1152ebc64a4a2609d23c9e400a6111db642 (patch) | |
| tree | 7672c12a59dbab1864606109e4f2b1dd7534043c /nikola/nikola.py | |
| parent | a40930043121a4b60de8526d58417761a54ab718 (diff) | |
Imported Upstream version 5.3upstream/5.3
Diffstat (limited to 'nikola/nikola.py')
| -rw-r--r-- | nikola/nikola.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nikola/nikola.py b/nikola/nikola.py index e10c84e..88de88c 100644 --- a/nikola/nikola.py +++ b/nikola/nikola.py @@ -130,8 +130,9 @@ class Nikola(object): 'TAG_PAGES_ARE_INDEXES': False, 'THEME': 'site', 'THUMBNAIL_SIZE': 180, - 'USE_FILENAME_AS_TITLE': True, 'USE_BUNDLES': True, + 'USE_CDN': False, + 'USE_FILENAME_AS_TITLE': True, } self.config.update(config) @@ -184,16 +185,17 @@ class Nikola(object): self.GLOBAL_CONTEXT['rel_link'] = self.rel_link self.GLOBAL_CONTEXT['abs_link'] = self.abs_link self.GLOBAL_CONTEXT['exists'] = self.file_exists + self.GLOBAL_CONTEXT['SLUG_TAG_PATH'] = self.config[ + 'SLUG_TAG_PATH'] self.GLOBAL_CONTEXT['add_this_buttons'] = self.config[ 'ADD_THIS_BUTTONS'] self.GLOBAL_CONTEXT['index_display_post_count'] = self.config[ 'INDEX_DISPLAY_POST_COUNT'] self.GLOBAL_CONTEXT['use_bundles'] = self.config['USE_BUNDLES'] + self.GLOBAL_CONTEXT['use_cdn'] = self.config.get("USE_CDN") self.GLOBAL_CONTEXT['favicons'] = self.config['FAVICONS'] - if 'date_format' not in self.GLOBAL_CONTEXT: - self.GLOBAL_CONTEXT['date_format'] = '%Y-%m-%d %H:%M' - + self.GLOBAL_CONTEXT['date_format'] = self.config.get('DATE_FORMAT', '%Y-%m-%d %H:%M') self.GLOBAL_CONTEXT['blog_author'] = self.config.get('BLOG_AUTHOR') self.GLOBAL_CONTEXT['blog_title'] = self.config.get('BLOG_TITLE') self.GLOBAL_CONTEXT['blog_url'] = self.config.get('BLOG_URL') |