Merge branch 'devel' of https://github.com/nerosketch/djing into devel

# Conflicts:
#	taskapp/locale/ru/LC_MESSAGES/django.po

taskapp/locale/ru/LC_MESSAGES/django.po

@@ -34,7 +34,7 @@ msgstr "Задача завершена"
 #: taskapp/handle.py:29
 #, python-format
 msgid "address %s %s.\ntelephone %s\n"
-msgstr "%s %s\n%s\n"
+msgstr "адрес: %s %s\nтел. %s\n"
 
 #: taskapp/handle.py:32
 #, python-format

taskapp/models.py

@@ -124,13 +124,14 @@ def task_handler(sender, instance, **kwargs):
         )
 
 
-def task_delete(sender, instance, **kwargs):
-    ChangeLog.objects.create(
-        task=instance,
-        act_type='d',
-        who=instance.author
-    )
+#def task_delete(sender, instance, **kwargs):
+#    ChangeLog.objects.create(
+#        task=instance,
+#        act_type='d',
+#        who=instance.author
+#    )
 
 
 models.signals.post_save.connect(task_handler, sender=Task)
-models.signals.post_delete.connect(task_delete, sender=Task)
+#models.signals.post_delete.connect(task_delete, sender=Task)
+