X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/2c0eb88678075e583641f4d1debe3bec2bfd0bf1..b8e94e0e7cc7576cbaacd3c737d6ffca6b12db53:/apps/picture/models.py diff --git a/apps/picture/models.py b/apps/picture/models.py index 70efd781b..7ef6ca7cd 100644 --- a/apps/picture/models.py +++ b/apps/picture/models.py @@ -72,7 +72,7 @@ class Picture(models.Model): Picture resource. """ - title = models.CharField(_('title'), max_length=255) + title = models.CharField(_('title'), max_length=32767) slug = models.SlugField(_('slug'), max_length=120, db_index=True, unique=True) sort_key = models.CharField(_('sort key'), max_length=120, db_index=True, editable=False) sort_key_author = models.CharField(_('sort key by author'), max_length=120, db_index=True, editable=False, default=u'') @@ -161,7 +161,7 @@ class Picture(models.Model): raise Picture.AlreadyExists('Picture %s already exists' % picture_xml.slug) picture.areas.all().delete() - picture.title = unicode(picture_xml.picture_info.title)[:255] + picture.title = unicode(picture_xml.picture_info.title) picture.extra_info = picture_xml.picture_info.to_dict() picture_tags = set(catalogue.models.Tag.tags_from_info(picture_xml.picture_info)) @@ -170,6 +170,9 @@ class Picture(models.Model): area_data = {'themes':{}, 'things':{}} + # Treat all names in picture XML as in default language. + lang = settings.LANGUAGE_CODE + for part in picture_xml.partiter(): if picture_xml.frame: c = picture_xml.frame[0] @@ -180,7 +183,8 @@ class Picture(models.Model): objname = objname.strip() tag, created = catalogue.models.Tag.objects.get_or_create(slug=slughifi(objname), category='thing') if created: - tag.name = objname + tag.name = objname.capitalize() + setattr(tag, 'name_%s' % lang, tag.name) tag.sort_key = sortify(tag.name) tag.save() #thing_tags.add(tag) @@ -340,6 +344,7 @@ class Picture(models.Model): template % (self.pk, lang) for template in [ '/katalog/p/%d/short.%s.html', + '/katalog/p/%d/mini.%s.html', ] for lang in languages ])