From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Fri, 8 Feb 2013 13:38:02 +0000 (+0100)
Subject: Merge branch 'merge_1' into edumed
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/b2c05060cee75fc1b6902e08c706ca369a37e1ab?hp=3e4d96cd7fdd08910887be91ead79e446a96fe53

Merge branch 'merge_1' into edumed
---

diff --git a/apps/catalogue/management/commands/make_master.py b/apps/catalogue/management/commands/make_master.py
index 4bca3834..b2622013 100644
--- a/apps/catalogue/management/commands/make_master.py
+++ b/apps/catalogue/management/commands/make_master.py
@@ -2,6 +2,7 @@
 
 from django.core.management.base import BaseCommand
 from django.core.management.color import color_style
+from django.utils.encoding import smart_unicode
 from catalogue.management.prompt import confirm
 from catalogue.models import Book
 from optparse import make_option
@@ -81,6 +82,7 @@ class Command(BaseCommand):
             holder['xml'] += u"%s\n" % t
 
         def dc(k, v):
+            v = smart_unicode(v)
             p(u'<dc:%s xml:lang="pl" xmlns:dc="http://purl.org/dc/elements/1.1/">%s</dc:%s>' % (k, v, k))
 
         def t(tag, ct):
diff --git a/lib/librarian b/lib/librarian
index f921a036..a1e43b7b 160000
--- a/lib/librarian
+++ b/lib/librarian
@@ -1 +1 @@
-Subproject commit f921a036ff55ff3a43ad2c93c8d8eb808fd54724
+Subproject commit a1e43b7bba2a0c7cf33280143bb49af3fef5d0d0