de, en, lt translations for infopages

[wolnelektury.git] / apps / catalogue / views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 102b38e..7322210 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -50,11 +50,12 @@ def main_page(request):
     if request.user.is_authenticated():
         shelves = models.Tag.objects.filter(category='set', user=request.user)
         new_set_form = forms.NewSetForm()
     if request.user.is_authenticated():
         shelves = models.Tag.objects.filter(category='set', user=request.user)
         new_set_form = forms.NewSetForm()

-    extra_where = "NOT catalogue_tag.category = 'set'"
-    tags = models.Tag.objects.usage_for_model(models.Book, counts=True, extra={'where': [extra_where]})
-    fragment_tags = models.Tag.objects.usage_for_model(models.Fragment, counts=True,
-        extra={'where': ["catalogue_tag.category = 'theme'"] + [extra_where]})
+
+    tags = models.Tag.objects.exclude(category__in=('set', 'book'))
+    for tag in tags:
+        tag.count = tag.get_count()

     categories = split_tags(tags)
     categories = split_tags(tags)

+    fragment_tags = categories.get('theme', [])

 
     form = forms.SearchForm()
     return render_to_response('catalogue/main_page.html', locals(),
 
     form = forms.SearchForm()
     return render_to_response('catalogue/main_page.html', locals(),


@@ -119,7 +120,7 @@ def tagged_object_list(request, tags=''):
 
         if shelf_tags:
             books = models.Book.tagged.with_all(shelf_tags).order_by()
 
         if shelf_tags:
             books = models.Book.tagged.with_all(shelf_tags).order_by()

-            l_tags = [book.book_tag() for book in books]
+            l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books])

             fragments = models.Fragment.tagged.with_any(l_tags, fragments)
 
         # newtagging goes crazy if we just try:
             fragments = models.Fragment.tagged.with_any(l_tags, fragments)
 
         # newtagging goes crazy if we just try:


@@ -139,7 +140,7 @@ def tagged_object_list(request, tags=''):
         objects = models.Book.tagged.with_all(tags).order_by()
         if not shelf_is_set:
             # eliminate descendants
         objects = models.Book.tagged.with_all(tags).order_by()
         if not shelf_is_set:
             # eliminate descendants

-            l_tags = [book.book_tag() for book in objects]
+            l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in objects])

             descendants_keys = [book.pk for book in models.Book.tagged.with_any(l_tags)]
             if descendants_keys:
                 objects = objects.exclude(pk__in=descendants_keys)
             descendants_keys = [book.pk for book in models.Book.tagged.with_any(l_tags)]
             if descendants_keys:
                 objects = objects.exclude(pk__in=descendants_keys)


@@ -203,8 +204,12 @@ def book_detail(request, slug):
     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)
     book_children = book.children.all().order_by('parent_number')
     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)
     book_children = book.children.all().order_by('parent_number')

-    extra_where = "catalogue_tag.category = 'theme'"
-    book_themes = models.Tag.objects.related_for_model(book_tag, models.Fragment, counts=True, extra={'where': [extra_where]})
+
+    theme_counter = book.theme_counter
+    book_themes = models.Tag.objects.filter(pk__in=theme_counter.keys())
+    for tag in book_themes:
+        tag.count = theme_counter[tag.pk]
+

     extra_info = book.get_extra_info_value()
 
     form = forms.SearchForm()
     extra_info = book.get_extra_info_value()
 
     form = forms.SearchForm()


@@ -299,7 +304,6 @@ def _tags_starting_with(prefix, user=None):
         tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user)))
     else:
         tags = tags.filter(~Q(category='book') & ~Q(category='set'))
         tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user)))
     else:
         tags = tags.filter(~Q(category='book') & ~Q(category='set'))

-

     return list(books) + list(tags) + list(book_stubs)
 
 
     return list(books) + list(tags) + list(book_stubs)
 
 


@@ -316,7 +320,7 @@ def _get_result_type(match):
         type = 'book'
     else:
         type = match.category
         type = 'book'
     else:
         type = match.category

-    return dict(models.TAG_CATEGORIES)[type]
+    return type

 
 
 
 
 
 


@@ -374,8 +378,13 @@ def tags_starting_with(request):
     # Prefix must have at least 2 characters
     if len(prefix) < 2:
         return HttpResponse('')
     # Prefix must have at least 2 characters
     if len(prefix) < 2:
         return HttpResponse('')

-
-    return HttpResponse('\n'.join(tag.name for tag in _tags_starting_with(prefix, request.user)))
+    tags_list = []
+    result = ""   
+    for tag in _tags_starting_with(prefix, request.user):
+        if not tag.name in tags_list:
+            result += "\n" + tag.name
+            tags_list.append(tag.name)
+    return HttpResponse(result)

 
 # ====================
 # = Shelf management =
 
 # ====================
 # = Shelf management =


@@ -404,11 +413,11 @@ def book_sets(request, slug):
             new_shelves = [models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']]
 
             for shelf in [shelf for shelf in old_shelves if shelf not in new_shelves]:
             new_shelves = [models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']]
 
             for shelf in [shelf for shelf in old_shelves if shelf not in new_shelves]:

-                shelf.book_count -= 1
+                shelf.book_count = None

                 shelf.save()
 
             for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]:
                 shelf.save()
 
             for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]:

-                shelf.book_count += 1
+                shelf.book_count = None

                 shelf.save()
 
             book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))
                 shelf.save()
 
             book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))


@@ -434,7 +443,7 @@ def remove_from_shelf(request, shelf, book):
     if shelf in book.tags:
         models.Tag.objects.remove_tag(book, shelf)
 
     if shelf in book.tags:
         models.Tag.objects.remove_tag(book, shelf)
 

-        shelf.book_count -= 1
+        shelf.book_count = None

         shelf.save()
 
         return HttpResponse(_('Book was successfully removed from the shelf'))
         shelf.save()
 
         return HttpResponse(_('Book was successfully removed from the shelf'))


@@ -614,7 +623,6 @@ def import_book(request):
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))

-            _('Today is %(month)s, %(day)s.') % {'month': m, 'day': d}

             return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") % {'exception':exception, 'tb':tb}, mimetype='text/plain')
         return HttpResponse(_("Book imported successfully"))
     else:
             return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") % {'exception':exception, 'tb':tb}, mimetype='text/plain')
         return HttpResponse(_("Book imported successfully"))
     else: