diff --git a/flatfilecms/events.py b/flatfilecms/events.py
index 7589f71..a6ee448 100644
--- a/flatfilecms/events.py
+++ b/flatfilecms/events.py
@@ -1,5 +1,6 @@
from babel import dates
from datetime import date
+from functools import partial
from pyramid.events import subscriber
from pyramid.events import BeforeRender
@@ -9,11 +10,13 @@ from .models import load_yaml
@subscriber(BeforeRender)
def add_global(event):
- dates.LC_TIME = event['request'].locale_name
event['globals'] = {
- 'format_date': dates.format_date,
- 'format_datetime': dates.format_datetime,
- 'today': date.today(),
+ 'format_date':
+ partial(dates.format_date, locale=event['request'].locale_name),
+ 'format_datetime':
+ partial(dates.format_datetime, locale=event['request'].locale_name),
+ 'today':
+ date.today(),
}
diff --git a/flatfilecms/templates/base.jinja2 b/flatfilecms/templates/base.jinja2
index da30f9b..d5a3993 100644
--- a/flatfilecms/templates/base.jinja2
+++ b/flatfilecms/templates/base.jinja2
@@ -22,7 +22,7 @@
-
+
diff --git a/flatfilecms/templates/solution.jinja2 b/flatfilecms/templates/solution.jinja2
index bb72e9d..784e65d 100644
--- a/flatfilecms/templates/solution.jinja2
+++ b/flatfilecms/templates/solution.jinja2
@@ -5,16 +5,16 @@
{{content|safe}}
{% endif %}
{% for name in ['why', 'what', 'who', 'call'] %}
- {% if name in data %}
+ {% if name in page %}
{{("{% call macros.b(tag='section', id='"+name+"') %}")|safe}}
-{{data[name]|safe}}
+{{page[name]|safe}}
{{"{% endcall %}"|safe}}
{% endif %}
{% endfor %}
- {% if 'abbr' in data %}
-{{data['abbr']|safe}}
+ {% if 'abbr' in page %}
+{{page['abbr']|safe}}
{% endif %}
{% endfilter %}
{% endblock %}