From: Marcin Koziej <marcin@lolownia.org>
Date: Thu, 5 Apr 2012 08:42:19 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/fnp/wolnelektury
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/64937dc9f4780d4c6cd31bd8a96f55189f57573b?hp=9a0deb49e85ee676f71f15abafa382ebf4cf92ee

Merge branch 'master' of https://github.com/fnp/wolnelektury
---

diff --git a/apps/modeltranslation/management/commands/translation2po.py b/apps/modeltranslation/management/commands/translation2po.py
index 57ef7fecf..09eec1a65 100644
--- a/apps/modeltranslation/management/commands/translation2po.py
+++ b/apps/modeltranslation/management/commands/translation2po.py
@@ -115,9 +115,13 @@ class Command(BaseCommand):
                                 po = make_po(cur_lang)
                                 pofiles[cur_lang] = po
 
+                            k = getattr(obj, '%s_%s' % (fld, settings.LANGUAGE_CODE))
+                            if k is None: k = ''
+                            v = getattr(obj, locfld)
+                            if v is None: v = ''
                             entry = polib.POEntry(
-                                msgid=getattr(obj, '%s_%s' % (fld, settings.LANGUAGE_CODE)),
-                                msgstr=getattr(obj, locfld),
+                                msgid=k,
+                                msgstr=v,
                                 occurrences=[('%s/%s/%s' % (appname, md.__name__, locfld), obj.id)])
                             po.append(entry)
 
@@ -125,4 +129,5 @@ class Command(BaseCommand):
             for lng, po in pofiles.items():
                 try: os.makedirs(os.path.join(directory, lng))
                 except OSError: pass
+                print lng, options
                 po.save(os.path.join(directory, lng, '%s.po' % options['poname']))
diff --git a/apps/wolnelektury_core/management/commands/localepack.py b/apps/wolnelektury_core/management/commands/localepack.py
index 5d8ec870d..146cd3182 100644
--- a/apps/wolnelektury_core/management/commands/localepack.py
+++ b/apps/wolnelektury_core/management/commands/localepack.py
@@ -167,7 +167,7 @@ class Command(BaseCommand):
             raise NotImplementedError('Sorry. Only zip format supported at the moment.')
 
         tmp_dir = tempfile.mkdtemp('-wl-locale')
-        out_dir = os.path.join(tmp_dir, packname)
+        out_dir = os.path.join(tmp_dir, packname_b)
         os.mkdir(out_dir)
 
         try: