From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Fri, 30 Dec 2011 12:43:35 +0000 (+0100)
Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/50f38b58c45dc9b68da614b3e26d45951088ec0c?hp=0a693dbc08fd1c2c95538f627985fc03f9e3b684

Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
---

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 78e6b0b3d..670b66735 100644
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -33,6 +33,7 @@ from os import path
 
 import search
 
+# Those are hard-coded here so that makemessages sees them.
 TAG_CATEGORIES = (
     ('author', _('author')),
     ('epoch', _('epoch')),
diff --git a/apps/search/management/commands/reindex.py b/apps/search/management/commands/reindex.py
index 9639a5ae7..6d4b4fd56 100755
--- a/apps/search/management/commands/reindex.py
+++ b/apps/search/management/commands/reindex.py
@@ -14,3 +14,4 @@ class Command(BaseCommand):
             idx.index_book(b, None)
         print 'Reindexing tags.'
         idx.index_tags()
+        idx.close()
\ No newline at end of file
diff --git a/apps/search/views.py b/apps/search/views.py
index bfa3c9b93..6dcaf74d3 100644
--- a/apps/search/views.py
+++ b/apps/search/views.py
@@ -41,13 +41,6 @@ def did_you_mean(query, tokens):
     return query
 
 
-def category_name(category):
-    try:
-        return filter(lambda c: c[0] == category, TAG_CATEGORIES)[0][1].encode('utf-8')
-    except IndexError:
-        raise KeyError("No category %s" % category)
-
-
 def hint(request):
     prefix = request.GET.get('term', '')
     if len(prefix) < 2:
@@ -75,12 +68,12 @@ def hint(request):
 
     return JSONResponse(
         [{'label': t.name,
-          'category': _(category_name(t.category)),
+          'category': _(t.category),
           'id': t.id,
           'url': t.get_absolute_url()}
           for t in tags] + \
           [{'label': b.title,
-            'category': _(category_name('book')),
+            'category': _('book'),
             'id': b.id,
             'url': b.get_absolute_url()}
             for b in books])