Merge branch 'master' into lucene_memory

[wolnelektury.git] / apps / wolnelektury_core / management / commands / localepack.py

diff --git a/apps/wolnelektury_core/management/commands/localepack.py b/apps/wolnelektury_core/management/commands/localepack.py
index e5362fe..146cd31 100644 (file)
--- a/apps/wolnelektury_core/management/commands/localepack.py
+++ b/apps/wolnelektury_core/management/commands/localepack.py
@@ -45,18 +45,29 @@ class AppLocale(Locale):
     def save(self, output_directory, languages):
         for lc in languages:
             lc = lc[0]
-            out = os.path.join(output_directory, lc, self.name + '.po')
             if os.path.exists(os.path.join(self.path, 'locale', lc)):
-                if not os.path.exists(os.path.dirname(out)):
-                    os.makedirs(os.path.dirname(dir))
                 shutil.copy2(os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po'),
-                         out)
+                          os.path.join(output_directory, lc, self.name + '.po'))
+
 
     def load(self, input_directory, languages):
         for lc in zip(*languages)[0]:
             if os.path.exists(os.path.join(input_directory, lc, self.name + '.po')):
+                out = os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po')
+                if not os.path.exists(os.path.dirname(out)):
+                    os.makedirs(os.path.dirname(out))
                 shutil.copy2(os.path.join(input_directory, lc, self.name + '.po'),
-                             os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po'))
+                             out)
+
+        wd = os.getcwd()
+        os.chdir(self.path)
+        try:
+            call_command('compilemessages', settings='wolnelektury.settings')
+        except:
+            pass
+        finally:
+            os.chdir(wd)
+
 
     def generate(self, languages):
         wd = os.getcwd()
@@ -156,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: