From 95c18e3e3f0b948641273ef5beefdf46faa77757 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: Sat, 18 May 2019 14:31:29 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B0=D1=82=20[closes?=
 =?UTF-8?q?=20#35]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flatfilecms/events.py                  | 11 +++++++++--
 flatfilecms/templates/blogposts.jinja2 |  4 ++--
 flatfilecms/templates/header.jinja2    |  4 ++--
 tests/conftest.py                      |  9 +++++++++
 tests/test_events.py                   |  7 +++++++
 tests/test_pages.py                    |  6 ------
 6 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 tests/conftest.py
 create mode 100644 tests/test_events.py

diff --git a/flatfilecms/events.py b/flatfilecms/events.py
index 409d94f..7516fe1 100644
--- a/flatfilecms/events.py
+++ b/flatfilecms/events.py
@@ -1,8 +1,15 @@
+from babel import dates
+from datetime import date
+
 from pyramid.events import subscriber
 from pyramid.events import BeforeRender
 
 
 @subscriber(BeforeRender)
 def add_global(event):
-    import datetime
-    event['datetime'] = datetime
+    dates.LC_TIME = event['request'].locale_name
+    event['globals'] = {
+        'format_date': dates.format_date,
+        'format_datetime': dates.format_datetime,
+        'today': date.today(),
+    }
diff --git a/flatfilecms/templates/blogposts.jinja2 b/flatfilecms/templates/blogposts.jinja2
index 197ebac..193b9af 100644
--- a/flatfilecms/templates/blogposts.jinja2
+++ b/flatfilecms/templates/blogposts.jinja2
@@ -11,8 +11,8 @@
 <a href="{{item[0]}}" class="btn btn-primary">Читать</a>
 </div>
 <div class="card-footer"><small class=text-muted">
-Опубликовано {{item[1].page['published']}}
-{%- if item[1].page['updated'] %}, обновлено {{item[1].page['updated']}}{% endif %}
+Опубликовано {{globals.format_date(item[1].page['published'], format='long')}}
+{%- if item[1].page['updated'] %}, обновлено {{globals.format_date(item[1].page['updated'], format='long')}}{% endif %}
 </small></div>
 </div>
 {% endfor %}
diff --git a/flatfilecms/templates/header.jinja2 b/flatfilecms/templates/header.jinja2
index cd000ec..4b47c96 100644
--- a/flatfilecms/templates/header.jinja2
+++ b/flatfilecms/templates/header.jinja2
@@ -56,8 +56,8 @@
     <h1 class="page-title">{{title}}</h1>
     {%- if description %}<p class="page-lead">{{description}}</p>{% endif %}
     <div class="row">
-    {%- if published %}<p class="col-6 col-sm-4 col-md-3"><i class="fas fa-calendar-day"></i> {{published}}</p>{% endif %}
-    {%- if updated %}<p class="col-6 col-sm-4 col-md-3"><i class="fas fa-edit"></i> {{updated}}</p>{% endif %}
+    {%- if published %}<p class="col-6 col-sm-4 col-md-3"><i class="fas fa-calendar-day"></i> {{globals.format_date(published, format='long')}}</p>{% endif %}
+  {%- if updated %}<p class="col-6 col-sm-4 col-md-3"><i class="fas fa-edit"></i> {{globals.format_date(updated, format='long')}}</p>{% endif %}
     </div>
   </div>
 </div>
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 0000000..98b334e
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,9 @@
+import pytest
+
+
+@pytest.fixture
+def fake_request():
+    from pyramid.testing import DummyRequest
+    return DummyRequest()
+
+
diff --git a/tests/test_events.py b/tests/test_events.py
new file mode 100644
index 0000000..9439091
--- /dev/null
+++ b/tests/test_events.py
@@ -0,0 +1,7 @@
+def test_globals(fake_request):
+    from flatfilecms.events import add_global
+    event = {'request': fake_request}
+    add_global(event)
+    assert 'globals' in event
+    assert 'format_date' in event['globals']
+    assert 'format_datetime' in event['globals']
diff --git a/tests/test_pages.py b/tests/test_pages.py
index f871353..8e1308d 100644
--- a/tests/test_pages.py
+++ b/tests/test_pages.py
@@ -15,12 +15,6 @@ def pages(current_directory):
         str(current_directory / 'data'))
 
 
-@pytest.fixture
-def fake_request():
-    from pyramid.testing import DummyRequest
-    return DummyRequest()
-
-
 @pytest.fixture
 def config(current_directory):
     from pyramid.testing import testConfig