# HG changeset patch # User Dirk Olmes # Date 1412216374 -7200 # Node ID ea8a767f51113967d5f1470bd0da3fd02e9899e9 # Parent 84aa3a9a4001160498a252d53572aec5d132ad9f fiddle with L10N: generate the proper element into the article page, depending on a page's defined locale with fallback to the default locale diff -r 84aa3a9a4001 -r ea8a767f5111 pelicanconf.py --- a/pelicanconf.py Thu Oct 02 04:13:28 2014 +0200 +++ b/pelicanconf.py Thu Oct 02 04:19:34 2014 +0200 @@ -7,8 +7,9 @@ SITEURL = 'http://xanthippe.duckdns.org/blog' ARCHIVES_URL = 'archives.html' -LOCALE = 'de_DE' +DEFAULT_LANG = u'de' TIMEZONE = 'Europe/Berlin' +DEFAULT_DATE_FORMAT = u'%d.%m.%Y' TYPOGRIFY = True PLUGIN_PATHS = ['../simple_comments'] @@ -29,9 +30,6 @@ THEME = 'themes/tuxlite_tbs' DISPLAY_CATEGORIES_ON_MENU = False -DEFAULT_LANG = u'de_DE' -DEFAULT_DATE_FORMAT = u'%d.%m.%Y' - # Feed generation is usually not desired when developing FEED_ALL_ATOM = None CATEGORY_FEED_ATOM = None diff -r 84aa3a9a4001 -r ea8a767f5111 themes/tuxlite_tbs/templates/article.html --- a/themes/tuxlite_tbs/templates/article.html Thu Oct 02 04:13:28 2014 +0200 +++ b/themes/tuxlite_tbs/templates/article.html Thu Oct 02 04:19:34 2014 +0200 @@ -1,4 +1,12 @@ {% extends "base.html" %} +{% block htmlspec %} +{% if article.metadata.lang %} + +{% else %} +{{ super() }} +{% endif %} +{% endblock %} + {% block content %}
diff -r 84aa3a9a4001 -r ea8a767f5111 themes/tuxlite_tbs/templates/base.html --- a/themes/tuxlite_tbs/templates/base.html Thu Oct 02 04:13:28 2014 +0200 +++ b/themes/tuxlite_tbs/templates/base.html Thu Oct 02 04:19:34 2014 +0200 @@ -1,5 +1,7 @@ - +{% block htmlspec %} + +{% endblock %} {% block windowtitle %}{{ SITENAME }}{% endblock %}