From 0d0cb70eb5eab96c050b0dd26ea4660bdd940cbf Mon Sep 17 00:00:00 2001 From: Dirk Eschler Date: Tue, 2 Mar 2010 16:47:19 +0000 Subject: [PATCH] Only print debug statements to stdout if the runserver or runserver_plus management commands are used. Resolves issue 16. --- CHANGELOG.txt | 10 ++++++++++ modeltranslation/models.py | 14 +++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 35f84ee..9104c62 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,14 +1,24 @@ + FIXED: Only print debug statements to stdout if the runserver or + runserver_plus management commands are used. + Resolves issue 16. FIXED: Removed print statements so that modeltranslation is usable with mod_wsgi. + Resolves issue 7. FIXED: Broken admin fields and fieldsets. + Resolves issue 9. FIXED: Creation of db fields with invalid python language code. + Resolves issue 4. FIXED: Tests to run from any project. + Resolves issue 6. FIXED: Removed unused dependency to content type which can break syncdb. + Resolves issue 1. CHANGED: Removed TRANSLATION_REGISTRY setting. ADDED: Initial support for south. + Resolves issue 11. ADDED: Support for admin inlines. + Resolves issue 12. v0.1 diff --git a/modeltranslation/models.py b/modeltranslation/models.py index 79b20db..7ac73f7 100644 --- a/modeltranslation/models.py +++ b/modeltranslation/models.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import sys from django.db import models from django.conf import settings from modeltranslation.translator import translator @@ -12,7 +13,6 @@ from modeltranslation.translator import translator try: import translation except ImportError: - import sys sys.stderr.write("modeltranslation: Error can't find the file " \ "'translation.py' in your project root.\n") sys.exit(1) @@ -20,7 +20,11 @@ except ImportError: # After importing all translation modules, all translation classes are # registered with the translator. if settings.DEBUG: - translated_model_names = ', '.join( - t.__name__ for t in translator._registry.keys()) - print "modeltranslation: Registered %d models for translation (%s)." % ( - len(translator._registry), translated_model_names) + try: + if sys.argv[1] in ('runserver', 'runserver_plus'): + translated_model_names = ', '.join( + t.__name__ for t in translator._registry.keys()) + print "modeltranslation: Registered %d models for translation " \ + "(%s)." % (len(translator._registry), translated_model_names) + except IndexError: + pass