From 01414a171db4ebbc230ca53011c94edc033b9605 Mon Sep 17 00:00:00 2001
From: Slava Kyrachevsky <slava.deb@gmail.com>
Date: Wed, 28 Jun 2017 11:46:39 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                            | 4 ++--
 apps/conference/tests/test_views.py | 8 ++++----
 apps/conference/views.py            | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 27ad98c3..951c28e3 100644
--- a/Makefile
+++ b/Makefile
@@ -35,10 +35,10 @@ solrstop:
 	/opt/solr/bin/solr stop -all
 
 makemessages:
-	-@ipython manage.py makemessages --all
+	-@python manage.py makemessages --all
 
 compilemessages:
-	-@ipython manage.py compilemessages
+	-@python manage.py compilemessages
 
 collectstatic:
 	@ipython manage.py collectstatic
diff --git a/apps/conference/tests/test_views.py b/apps/conference/tests/test_views.py
index 400aba7f..c7e4ab88 100644
--- a/apps/conference/tests/test_views.py
+++ b/apps/conference/tests/test_views.py
@@ -74,7 +74,7 @@ class CanFilterAndSidePopular(object):
 class ConferenceByCountryTest(ConferenceByTest, CanFilterAndSidePopular, TestCase):
     url = reverse('conference_country')
     title1 = _(u'По странам')
-    title2 = _(u'Коференции мира по странам')
+    title2 = _(u'Конференции мира по странам')
     catalog = 'country/'
     model = Country
 
@@ -82,21 +82,21 @@ class ConferenceByCountryTest(ConferenceByTest, CanFilterAndSidePopular, TestCas
 class ConferenceByThemeTest(ConferenceByTest, TestCase):
     url = reverse('conference_theme')
     title1 = _(u'По тематикам')
-    title2 = _(u'Коференции мира по тематикам')
+    title2 = _(u'Конференции мира по тематикам')
     catalog = 'theme/'
 
 
 class ConferenceByTagTest(ConferenceByTest, TestCase):
     url = reverse('conference_tag')
     title1 = _(u'По тегам')
-    title2 = _(u'Коференции мира по тегам')
+    title2 = _(u'Конференции мира по тегам')
     catalog = 'tag/'
 
 
 class ConferenceByCityTest(ConferenceByTest, CanFilterAndSidePopular, TestCase):
     url = reverse('conference_city')
     title1 = _(u'По городам')
-    title2 = _(u'Коференции мира по городам')
+    title2 = _(u'Конференции мира по городам')
     catalog = 'city/'
     model = City
 
diff --git a/apps/conference/views.py b/apps/conference/views.py
index 7800de21..91ea2d30 100644
--- a/apps/conference/views.py
+++ b/apps/conference/views.py
@@ -63,7 +63,7 @@ class ConferenceBy(ConfFilterMixin, ConfSectionMixin, JitterCacheMixin, Metadata
 class ConferenceByCountry(ConferenceBy):
     model = Country
     title1 = _(u'По странам')
-    title2 = _(u'Коференции мира по странам')
+    title2 = _(u'Конференции мира по странам')
     catalog = 'country/'
     stat_kind = 'country'
 
@@ -84,7 +84,7 @@ class ConferenceByCountry(ConferenceBy):
 class ConferenceByTag(ConferenceBy):
     model = Tag
     title1 = _(u'По тегам')
-    title2 = _(u'Коференции мира по тегам')
+    title2 = _(u'Конференции мира по тегам')
     catalog = 'tag/'
     stat_kind = 'tag'
 
@@ -95,7 +95,7 @@ class ConferenceByTag(ConferenceBy):
 class ConferenceByTheme(ConferenceBy):
     model = Theme
     title1 = _(u'По тематикам')
-    title2 = _(u'Коференции мира по тематикам')
+    title2 = _(u'Конференции мира по тематикам')
     catalog = 'theme/'
     stat_kind = 'theme'
 
@@ -110,7 +110,7 @@ class ConferenceByTheme(ConferenceBy):
 class ConferenceByCity(ConferenceBy):
     model = City
     title1 = _(u'По городам')
-    title2 = _(u'Коференции мира по городам')
+    title2 = _(u'Конференции мира по городам')
     catalog = 'city/'
     stat_kind = 'city'