# HG changeset patch # User ymh # Date 1264130142 -3600 # Node ID 60555e0d17f4ca2ce824a4ae7977b5b831db4b9f # Parent e68b76e3ad737786a3ab8754bb59edba1a00edf7 commit patch from issue : http://code.google.com/p/django-modeltranslation/issues/detail?id=1 diff -r e68b76e3ad73 -r 60555e0d17f4 web/blinkster/__init__.py --- a/web/blinkster/__init__.py Fri Jan 22 02:46:03 2010 +0100 +++ b/web/blinkster/__init__.py Fri Jan 22 04:15:42 2010 +0100 @@ -1,3 +1,3 @@ -VERSION = (0,2) +VERSION = (0,3) VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION))) diff -r e68b76e3ad73 -r 60555e0d17f4 web/blinkster/models.py --- a/web/blinkster/models.py Fri Jan 22 02:46:03 2010 +0100 +++ b/web/blinkster/models.py Fri Jan 22 04:15:42 2010 +0100 @@ -5,9 +5,7 @@ import uuid import photologue.models from django.conf import settings - -def build_localized_fieldname(field_name, lang): - return '%s_%s' % (field_name, lang) +from modeltranslation.utils import build_localized_fieldname def get_sid(): return unicode(uuid.uuid1()) diff -r e68b76e3ad73 -r 60555e0d17f4 web/lib/modeltranslation/translator.py --- a/web/lib/modeltranslation/translator.py Fri Jan 22 02:46:03 2010 +0100 +++ b/web/lib/modeltranslation/translator.py Fri Jan 22 04:15:42 2010 +0100 @@ -1,5 +1,5 @@ from django.conf import settings -from django.contrib.contenttypes.models import ContentType +#from django.contrib.contenttypes.models import ContentType from django.db import models from django.db.models import signals from django.db.models.base import ModelBase @@ -25,8 +25,8 @@ on. """ def __init__(self, *args, **kwargs): - # self.translation_model = None - self.model_ct = None + # self.translation_model = None + #self.model_ct = None self.localized_fieldnames = list() #def get_localized_fieldnames(model): @@ -123,11 +123,11 @@ #validate(translation_opts, model) # Store the translation class associated to the model - self._registry[model] = translation_opts + self._registry[model] = translation_opts # Get the content type of the original model and store it on the # translation options for faster lookup later on. - translation_opts.model_ct = ContentType.objects.get_for_model(model) + #translation_opts.model_ct = ContentType.objects.get_for_model(model) # Add the localized fields to the model and store the names of these # fields in the model's translation options for faster lookup later