fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow books with internationalized metadata.
[wolnelektury.git]
/
apps
/
catalogue
/
templatetags
/
catalogue_tags.py
diff --git
a/apps/catalogue/templatetags/catalogue_tags.py
b/apps/catalogue/templatetags/catalogue_tags.py
index
af9bfae
..
d6a795f
100644
(file)
--- a/
apps/catalogue/templatetags/catalogue_tags.py
+++ b/
apps/catalogue/templatetags/catalogue_tags.py
@@
-14,7
+14,7
@@
from django.core.urlresolvers import reverse
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.translation import ugettext as _
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.translation import ugettext as _
-from catalogue.utils import split_tags
+from catalogue.utils import split_tags
, related_tag_name as _related_tag_name
from catalogue.models import Book, BookMedia, Fragment, Tag
from catalogue.constants import LICENSES
from catalogue.models import Book, BookMedia, Fragment, Tag
from catalogue.constants import LICENSES
@@
-311,6
+311,11
@@
def inline_tag_list(tags, choices=None):
return tag_list(tags, choices)
return tag_list(tags, choices)
+@register.inclusion_tag('catalogue/collection_list.html')
+def collection_list(collections):
+ return locals()
+
+
@register.inclusion_tag('catalogue/book_info.html')
def book_info(book):
return locals()
@register.inclusion_tag('catalogue/book_info.html')
def book_info(book):
return locals()
@@
-345,8
+350,8
@@
def book_short(context, book):
@register.inclusion_tag('catalogue/book_mini_box.html')
def book_mini(book):
@register.inclusion_tag('catalogue/book_mini_box.html')
def book_mini(book):
- author_str = ", ".join(
name
- for
name, url in book.related_info()['tags']['author']
)
+ author_str = ", ".join(
related_tag_name(tag)
+ for
tag in book.related_info()['tags'].get('author', ())
)
return {
'book': book,
'author_str': author_str,
return {
'book': book,
'author_str': author_str,
@@
-458,3
+463,8
@@
def license_icon(license_url):
"icon": "img/licenses/%s.png" % known['icon'],
"license_description": known['description'],
}
"icon": "img/licenses/%s.png" % known['icon'],
"license_description": known['description'],
}
+
+
+@register.simple_tag
+def related_tag_name(tag, lang=None):
+ return _related_tag_name(tag, lang)