Skip to content
Permalink
Browse files

Also supporting JS_DATE_FORMAT.

  • Loading branch information
felixfontein committed Sep 6, 2015
1 parent bcbffc4 commit 1823d2f96e80cb0112ed2b928add90d46ce8d9d0
Showing with 6 additions and 4 deletions.
  1. +1 −1 CHANGES.txt
  2. +2 −2 nikola/conf.py.in
  3. +3 −1 nikola/nikola.py
@@ -8,7 +8,7 @@ Features
* Made CATEGORY_PATH translatable (Issue #1914)
* Display post counts for archive links (Issue #2011)
* Document link/path handlers (Issue #2008)
* Made DATE_FORMAT translatable (Issue #2032)
* Made DATE_FORMAT and JS_DATE_FORMAT translatable (Issue #2032)

Bugfixes
--------
@@ -140,11 +140,11 @@ TIMEZONE = ${TIMEZONE}
# Note that this does not affect DATE_FORMAT.
# FORCE_ISO8601 = False

# (Translatable) Date format used to display post dates.
# Date format used to display post dates. (translatable)
# (str used by datetime.datetime.strftime)
# DATE_FORMAT = '%Y-%m-%d %H:%M'

# Date format used to display post dates, if local dates are used.
# Date format used to display post dates, if local dates are used. (translatable)
# (str used by moment.js)
# JS_DATE_FORMAT = 'YYYY-MM-DD HH:mm'

@@ -554,6 +554,7 @@ def __init__(self, **config):
'TAG_PATH',
'CATEGORY_PATH',
'DATE_FORMAT',
'JS_DATE_FORMAT',
)

self._GLOBAL_CONTEXT_TRANSLATABLE = ('blog_author',
@@ -566,7 +567,8 @@ def __init__(self, **config):
'search_form',
'body_end',
'extra_head_data',
'date_format',)
'date_format',
'js_date_format',)
# WARNING: navigation_links SHOULD NOT be added to the list above.
# Themes ask for [lang] there and we should provide it.

0 comments on commit 1823d2f

Please sign in to comment.
You can’t perform that action at this time.