X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1f9103b1e752a6c41d2304bf5e41a7d6ae0c45c8..31e96ec0d71911f016193d5b67b6da3dc697ac9c:/apps/catalogue/models/tag.py diff --git a/apps/catalogue/models/tag.py b/apps/catalogue/models/tag.py index 5b99b8f0b..acfb9d8f3 100644 --- a/apps/catalogue/models/tag.py +++ b/apps/catalogue/models/tag.py @@ -2,6 +2,7 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from django.conf import settings from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.db import models @@ -39,6 +40,7 @@ class Tag(TagBase): book_count = models.IntegerField(_('book count'), blank=True, null=True) picture_count = models.IntegerField(_('picture count'), blank=True, null=True) gazeta_link = models.CharField(blank=True, max_length=240) + culturepl_link = models.CharField(blank=True, max_length=240) wiki_link = models.CharField(blank=True, max_length=240) created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True) @@ -114,13 +116,13 @@ class Tag(TagBase): # I shouldn't break the get_count() api # just to include pictures. def get_picture_count(self): - from picture.models import Picture + from picture.models import Picture, PictureArea if self.category == 'book': # never used - objects = Book.objects.none() + objects = Picture.objects.none() elif self.category == 'theme': - objects = Picture.tagged.with_all((self,)) + objects = PictureArea.tagged.with_all((self,)) elif self.category == 'thing': objects = Picture.tagged.with_all((self,)) else: @@ -185,14 +187,28 @@ class Tag(TagBase): # For instance, Pictures do not have 'genre' field. continue for tag_name in tag_names: + lang = getattr(tag_name, 'lang', settings.LANGUAGE_CODE) tag_sort_key = tag_name if category == 'author': tag_sort_key = tag_name.last_name tag_name = tag_name.readable() - tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name), category=category) - if created: - tag.name = tag_name - tag.sort_key = sortify(tag_sort_key.lower()) - tag.save() - meta_tags.append(tag) + if lang == settings.LANGUAGE_CODE: + # Allow creating new tag, if it's in default language. + tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name), category=category) + if created: + tag_name = unicode(tag_name) + tag.name = tag_name + setattr(tag, "name_%s" % lang, tag_name) + tag.sort_key = sortify(tag_sort_key.lower()) + tag.save() + + meta_tags.append(tag) + else: + # Ignore unknown tags in non-default languages. + try: + tag = Tag.objects.get(category=category, **{"name_%s" % lang: tag_name}) + except Tag.DoesNotExist: + pass + else: + meta_tags.append(tag) return meta_tags