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

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 78e6b0b..670b667 100644 (file)
--- 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 9639a5a..6d4b4fd 100755 (executable)
--- 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 bfa3c9b..6dcaf74 100644 (file)
--- 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])