From b9b1cd31fa80a5b75fa9274b9a2f26e13bd829a4 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 8 Sep 2010 17:54:28 -0400 Subject: re-compiled messages and completely removed debug_toolbar from dependencies --- .../deps/livesettings/locale/en/LC_MESSAGES/django.mo | Bin 455 -> 367 bytes .../deps/livesettings/locale/it/LC_MESSAGES/django.mo | Bin 1596 -> 1582 bytes .../deps/livesettings/locale/tr/LC_MESSAGES/django.mo | Bin 1265 -> 1242 bytes askbot/locale/en/LC_MESSAGES/django.mo | Bin 455 -> 24987 bytes askbot/middleware/view_log.py | 11 ++++++----- setup.py | 2 +- 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 Binary files a/askbot/deps/livesettings/locale/en/LC_MESSAGES/django.mo and b/askbot/deps/livesettings/locale/en/LC_MESSAGES/django.mo differ 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 Binary files a/askbot/deps/livesettings/locale/it/LC_MESSAGES/django.mo and b/askbot/deps/livesettings/locale/it/LC_MESSAGES/django.mo differ 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 Binary files a/askbot/deps/livesettings/locale/tr/LC_MESSAGES/django.mo and b/askbot/deps/livesettings/locale/tr/LC_MESSAGES/django.mo differ diff --git a/askbot/locale/en/LC_MESSAGES/django.mo b/askbot/locale/en/LC_MESSAGES/django.mo index d39b62e8..39c2b011 100644 Binary files a/askbot/locale/en/LC_MESSAGES/django.mo and b/askbot/locale/en/LC_MESSAGES/django.mo differ 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 *' -- cgit v1.2.3-1-g7c22