re-compiled messages and completely removed debug_toolbar from dependencies

6 files changed, 7 insertions, 6 deletions

diff --git a/askbot/deps/livesettings/locale/en/LC_MESSAGES/django.mo b/askbot/deps/livesettings/locale/en/LC_MESSAGES/django.mo
index d39b62e8..c2bc0b94 100644
--- a/askbot/deps/livesettings/locale/en/LC_MESSAGES/django.mo
+++ b/askbot/deps/livesettings/locale/en/LC_MESSAGES/django.mo
diff --git a/askbot/deps/livesettings/locale/it/LC_MESSAGES/django.mo b/askbot/deps/livesettings/locale/it/LC_MESSAGES/django.mo
index 0be9abe7..05c50952 100644
--- a/askbot/deps/livesettings/locale/it/LC_MESSAGES/django.mo
+++ b/askbot/deps/livesettings/locale/it/LC_MESSAGES/django.mo
diff --git a/askbot/deps/livesettings/locale/tr/LC_MESSAGES/django.mo b/askbot/deps/livesettings/locale/tr/LC_MESSAGES/django.mo
index 8227d215..d56ad423 100644
--- a/askbot/deps/livesettings/locale/tr/LC_MESSAGES/django.mo
+++ b/askbot/deps/livesettings/locale/tr/LC_MESSAGES/django.mo
diff --git a/askbot/locale/en/LC_MESSAGES/django.mo b/askbot/locale/en/LC_MESSAGES/django.mo
index d39b62e8..39c2b011 100644
--- a/askbot/locale/en/LC_MESSAGES/django.mo
+++ b/askbot/locale/en/LC_MESSAGES/django.mo
diff --git a/askbot/middleware/view_log.py b/askbot/middleware/view_log.py
index cf612ad2..d3e2d2f1 100644
--- a/askbot/middleware/view_log.py
+++ b/askbot/middleware/view_log.py
@@ -51,11 +51,12 @@ class ViewLogMiddleware(object):
 
         if settings.DEBUG == True:
             #todo: dependency!
-            from debug_toolbar.views import debug_media as debug_media_view
-            if view_func == debug_media_view:
-                return
-            else:
-                view_str = view_func.__name__
+            try:
+                from debug_toolbar.views import debug_media as debug_media_view
+                if view_func == debug_media_view:
+                    return
+            except ImportError:
+                pass
 
         if request.user.is_authenticated():
             user_name = request.user.username
diff --git a/setup.py b/setup.py
index daf076be..30b4ff9f 100644
--- a/setup.py
+++ b/setup.py
@@ -75,7 +75,7 @@ if 'WIN_PLATFORM' in locals() and sys.platform in WIN_PLATFORMS:
 print '**************************************************************'
 print '*                                                            *'
 print '*  Thanks for installing Askbot.                             *'
-print '*  To start deploying type: >startforum                      *'
+print '*  To start deploying type: >python startforum               *'
 print '*  Please take a look at the manual askbot/doc/INSTALL       *'
 print '*  And please do not hesitate to ask your questions at       *'
 print '*  at http://askbot.org                                      *'