fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scale initial mark with the image
[wolnelektury.git]
/
apps
/
catalogue
/
utils.py
diff --git
a/apps/catalogue/utils.py
b/apps/catalogue/utils.py
index
b023f1a
..
33b0830
100644
(file)
--- a/
apps/catalogue/utils.py
+++ b/
apps/catalogue/utils.py
@@
-38,8
+38,12
@@
def get_random_hash(seed):
return urlsafe_b64encode(sha_digest).replace('=', '').replace('_', '-').lower()
return urlsafe_b64encode(sha_digest).replace('=', '').replace('_', '-').lower()
-def split_tags(tags):
- result = {}
+def split_tags(tags, initial=None):
+ if initial is None:
+ result = {}
+ else:
+ result = initial
+
for tag in tags:
result.setdefault(tag.category, []).append(tag)
return result
for tag in tags:
result.setdefault(tag.category, []).append(tag)
return result
@@
-317,7
+321,7
@@
This can sometimes occupy lots of memory, so trim it here a bit.
def related_tag_name(tag_info, language=None):
return tag_info.get("name_%s" % (language or get_language()),
def related_tag_name(tag_info, language=None):
return tag_info.get("name_%s" % (language or get_language()),
- tag_info.get("name_%s" % settings.LANGUAGE_CODE))
+ tag_info.get("name_%s" % settings.LANGUAGE_CODE
, ""
))
def delete_from_cache_by_language(cache, key_template):
def delete_from_cache_by_language(cache, key_template):