From 4e2c19e7e07f79a1596847556866659f5508fb80 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sat, 25 Oct 2014 10:55:21 +0200 Subject: [PATCH] Remove other changes, leaving the fix for the formatter function. --- src/calibre/utils/formatter_functions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/formatter_functions.py b/src/calibre/utils/formatter_functions.py index 42f06395c2..d3aacb96b9 100644 --- a/src/calibre/utils/formatter_functions.py +++ b/src/calibre/utils/formatter_functions.py @@ -1411,7 +1411,9 @@ class BuiltinUserCategories(BuiltinFormatterFunction): def evaluate(self, formatter, kwargs, mi, locals_): if hasattr(mi, '_proxy_metadata'): - return ', '.join(k for k, v in mi._proxy_metadata.user_categories.iteritems() if v) + cats = set(k for k, v in mi._proxy_metadata.user_categories.iteritems() if v) + cats = sorted(cats, key=sort_key) + return ', '.join(cats) return _('This function can be used only in the GUI') class BuiltinTransliterate(BuiltinFormatterFunction):