From e4a882abc859a8d5a88748a5783f344c1f00bd8d Mon Sep 17 00:00:00 2001 From: Peter Eschler Date: Sat, 21 Feb 2009 02:18:06 +0000 Subject: [PATCH] Mostly cleanup. --- modeltranslation/admin.py | 4 ++-- .../commands/update_translation_fields.py | 21 +++++++++---------- modeltranslation/translator.py | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/modeltranslation/admin.py b/modeltranslation/admin.py index 996d313..0282c02 100644 --- a/modeltranslation/admin.py +++ b/modeltranslation/admin.py @@ -18,7 +18,7 @@ class TranslationAdmin(admin.ModelAdmin): # Hide the original field by making it non-editable. if db_field.name in trans_opts.fields: - db_field.editable = False + db_field.editable = False # field.widget.attrs['readonly'] = "true" # For every localized field copy the widget from the original field @@ -31,7 +31,7 @@ class TranslationAdmin(admin.ModelAdmin): if db_field.language == settings.LANGUAGES[0][0] and orig_formfield.required: orig_formfield.required = False field.required = True - + field.widget = deepcopy(orig_formfield.widget) diff --git a/modeltranslation/management/commands/update_translation_fields.py b/modeltranslation/management/commands/update_translation_fields.py index e73ab31..c3bc6ea 100644 --- a/modeltranslation/management/commands/update_translation_fields.py +++ b/modeltranslation/management/commands/update_translation_fields.py @@ -5,22 +5,21 @@ from django.core.management.base import BaseCommand, CommandError, NoArgsCommand from modeltranslation.translator import translator from modeltranslation.utils import build_localized_fieldname -class Command(BaseCommand): +class Command(NoArgsCommand): help = 'Updates the default translation fields of all or the specified'\ - 'application using the value of the original field.' - args = '[app_name]' + 'translated application using the value of the original field.' + # args = '[app_name]' - def handle(self, subscriber_list_slug, **options): + def handle(self, **options): default_lang = settings.LANGUAGES[0][0] + print "Using default language:", default_lang - for model, trans_opts in translator._registry.items(): - print model, trans_opts - # Get all the instances of the model - for obj in model.objects.all(): - print obj + for model, trans_opts in translator._registry.items(): + print "Updating data of model '%s'" % model + for obj in model.objects.all(): for fieldname in trans_opts.fields: def_lang_fieldname = build_localized_fieldname(fieldname, default_lang) - print "setting %s from %s to %s." % (def_lang_fieldname, fieldname, obj.__dict__[fieldname]) + # print "setting %s from %s to %s." % (def_lang_fieldname, fieldname, obj.__dict__[fieldname]) if not getattr(obj, def_lang_fieldname): setattr(obj, def_lang_fieldname, obj.__dict__[fieldname]) - obj.save() \ No newline at end of file + obj.save() diff --git a/modeltranslation/translator.py b/modeltranslation/translator.py index 249de29..2175b73 100644 --- a/modeltranslation/translator.py +++ b/modeltranslation/translator.py @@ -143,7 +143,7 @@ class Translator(object): translation_opts.localized_fieldnames_rev = rev_dict - print "Applying descriptor field for model %s" % model + # print "Applying descriptor field for model %s" % model for field_name in translation_opts.fields: setattr(model, field_name, TranslationFieldDescriptor(field_name))