Merge branch 'master' into obrazy

[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..4ec7434 100644 (file)
--- a/apps/wolnelektury_core/management/commands/localepack.py
+++ b/apps/wolnelektury_core/management/commands/localepack.py
@@ -27,6 +27,11 @@ class Locale(object):
     def generate(self, languages):
         pass
 
+def copy_f(frm, to):
+    "I can create a necessary dest directiories, yey!"
+    if not os.path.exists(os.path.dirname(to)):
+        os.makedirs(os.path.dirname(to))
+    shutil.copyfile(frm,to)
 
 class AppLocale(Locale):
     def __init__(self, appmod):
@@ -45,18 +50,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)
+                copy_f(os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.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')):
-                shutil.copy2(os.path.join(input_directory, lc, self.name + '.po'),
-                             os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.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))
+                copy_f(os.path.join(input_directory, lc, self.name + '.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()
@@ -79,7 +95,7 @@ class ModelTranslation(Locale):
 
     def load(self, input_directory, languages):
         call_command('translation2po', self.appname, directory=input_directory,
-                     load=True, lang=','.join(zip(*languages)[0]), poname=self.poname)
+                     load=True, lang=','.join(zip(*languages)[0]), poname=self.poname, keep_running=True)
 
 
 class CustomLocale(Locale):
@@ -104,12 +120,12 @@ class CustomLocale(Locale):
     def save(self, output_directory, languages):
         for lc in zip(*languages)[0]:
             if os.path.exists(self.po_file(lc)):
-                shutil.copy2(self.po_file(lc),
+                copy_f(self.po_file(lc),
                              os.path.join(output_directory, lc, self.name + '.po'))
 
     def load(self, input_directory, languages):
         for lc in zip(*languages)[0]:
-            shutil.copy2(os.path.join(input_directory, lc, self.name + '.po'),
+            copy_f(os.path.join(input_directory, lc, self.name + '.po'),
                          self.po_file(lc))
         os.system('pybabel compile -D django -d %s' % os.path.dirname(self.out_file))
 
@@ -156,7 +172,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: