From dbde097865c97a63fb8d6dcd322c81089fb57cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=9A=D0=B0=D1=81=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B2?= <kasimov@radium-it.ru>
Date: Wed, 22 May 2019 22:08:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B9=20=D1=84?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=20=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20data=20=D0=B2=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flatfilecms/events.py                 | 11 +++++++----
 flatfilecms/templates/base.jinja2     |  2 +-
 flatfilecms/templates/solution.jinja2 |  8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

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 @@
     <meta name="theme-color" content="#333333">
     <meta name="twitter:title" content="{{title}}">
     <meta property="og:title" content="{{title}}" />
-    <meta property="og:url" content="{{data.base_url|join_url(request.path_qs)}}" />
+    <meta property="og:url" content="{{data['base_url']|join_url(request.path_qs)}}" />
     <meta property="og:type" content="article" />
     <meta name="twitter:card" content="{{summary or description}}">
     <meta name="twitter:description" content="{{description}}">
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 %}