opds fix

[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 147b51c..146cd31 100644 (file)
--- a/apps/wolnelektury_core/management/commands/localepack.py
+++ b/apps/wolnelektury_core/management/commands/localepack.py
@@ -9,6 +9,7 @@ import os
 import shutil
 import tempfile
 import sys
 import shutil
 import tempfile
 import sys

+import zipfile

 
 import allauth
 
 
 import allauth
 


@@ -46,13 +47,27 @@ class AppLocale(Locale):
             lc = lc[0]
             if os.path.exists(os.path.join(self.path, 'locale', lc)):
                 shutil.copy2(os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po'),
             lc = lc[0]
             if os.path.exists(os.path.join(self.path, 'locale', lc)):
                 shutil.copy2(os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po'),

-                         os.path.join(output_directory, lc, self.name + '.po'))
+                          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')):
 
     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'),
                 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()
 
     def generate(self, languages):
         wd = os.getcwd()


@@ -144,8 +159,15 @@ class Command(BaseCommand):
         return os.popen("git branch |grep '^[*]' | cut -c 3-").read()
 
     def save(self, options):
         return os.popen("git branch |grep '^[*]' | cut -c 3-").read()
 
     def save(self, options):

+        packname = options.get('outfile')
+        packname_b = os.path.basename(packname).split('.')[0]
+        fmt = '.'.join(os.path.basename(packname).split('.')[1:])
+
+        if fmt != 'zip':
+            raise NotImplementedError('Sorry. Only zip format supported at the moment.')
+

         tmp_dir = tempfile.mkdtemp('-wl-locale')
         tmp_dir = tempfile.mkdtemp('-wl-locale')

-        out_dir = os.path.join(tmp_dir, 'wl-locale')
+        out_dir = os.path.join(tmp_dir, packname_b)

         os.mkdir(out_dir)
 
         try:
         os.mkdir(out_dir)
 
         try:


@@ -163,10 +185,14 @@ class Command(BaseCommand):
             rf.write(rev)
             rf.close()
 
             rf.write(rev)
             rf.close()
 

-            packname = options.get('outfile')
-            packname_b = os.path.basename(packname).split('.')[0]
-            fmt = '.'.join(os.path.basename(packname).split('.')[1:])
-            shutil.make_archive(packname_b, fmt, root_dir=os.path.dirname(out_dir), base_dir=os.path.basename(out_dir))
+
+            cwd = os.getcwd()
+            try:
+                os.chdir(os.path.dirname(out_dir))
+                self.system('zip -r %s %s' % (os.path.join(cwd, packname_b+'.zip'), os.path.basename(out_dir)))
+            finally:
+                os.chdir(cwd)
+                #            shutil.make_archive(packname_b, fmt, root_dir=os.path.dirname(out_dir), base_dir=os.path.basename(out_dir))

         finally:
             shutil.rmtree(tmp_dir, ignore_errors=True)
 
         finally:
             shutil.rmtree(tmp_dir, ignore_errors=True)