fnp / wolnelektury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bugfix
[wolnelektury.git] / src / wolnelektury / management / commands / localepack.py
diff --git a/src/wolnelektury/management/commands/localepack.py b/src/wolnelektury/management/commands/localepack.py
index bd63192..d0e5d6c 100644 (file)
--- a/src/wolnelektury/management/commands/localepack.py
+++ b/src/wolnelektury/management/commands/localepack.py
@@ -1,21 +1,19 @@
-# -*- coding: utf-8 -*-
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from optparse import make_option
+import os
+import shutil
+import sys
+import tempfile
+import allauth
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.core.management import call_command
 from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.core.management import call_command
+from wolnelektury.utils import makedirs
 from .translation2po import get_languages
 
 from .translation2po import get_languages
 
-import os
-import shutil
-import tempfile
-import sys
-
-import allauth
 
 
-ROOT = os.path.dirname(settings.PROJECT_DIR)
+ROOT = settings.ROOT_DIR
 
 
 def is_our_app(mod):
 
 
 def is_our_app(mod):
@@ -26,15 +24,18 @@ class Locale(object):
     def save(self, output_directory, languages):
         pass
 
     def save(self, output_directory, languages):
         pass
 
+    def compile(self):
+        pass
+
     def generate(self, languages):
         pass
 
     def generate(self, languages):
         pass
 
+
 def copy_f(frm, to):
 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))
+    makedirs(os.path.dirname(to))
     shutil.copyfile(frm, to)
 
     shutil.copyfile(frm, to)
 
+
 class AppLocale(Locale):
     def __init__(self, appmod):
         self.app = appmod
 class AppLocale(Locale):
     def __init__(self, appmod):
         self.app = appmod
@@ -54,28 +55,26 @@ class AppLocale(Locale):
             lc = lc[0]
             if os.path.exists(os.path.join(self.path, 'locale', lc)):
                 copy_f(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)):
                 copy_f(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')):
                 out = os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.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))
-                copy_f(os.path.join(input_directory, lc, self.name + '.po'),
-                             out)
+                makedirs(os.path.dirname(out))
+                copy_f(os.path.join(input_directory, lc, self.name + '.po'), out)
+        self.compile()
 
 
+    def compile(self):
         wd = os.getcwd()
         os.chdir(self.path)
         try:
         wd = os.getcwd()
         os.chdir(self.path)
         try:
-            call_command('compilemessages', settings='wolnelektury.settings')
+            call_command('compilemessages', verbosity=0, settings='wolnelektury.settings')
         except:
             pass
         finally:
             os.chdir(wd)
 
         except:
             pass
         finally:
             os.chdir(wd)
 
-
     def generate(self, languages):
         wd = os.getcwd()
         os.chdir(self.path)
     def generate(self, languages):
         wd = os.getcwd()
         os.chdir(self.path)
@@ -103,7 +102,7 @@ class ModelTranslation(Locale):
 class CustomLocale(Locale):
     def __init__(self, app_dir,
                  config=os.path.join(ROOT, "babel.cfg"),
 class CustomLocale(Locale):
     def __init__(self, app_dir,
                  config=os.path.join(ROOT, "babel.cfg"),
-                 out_file=os.path.join(ROOT, 'wolnelektury/locale-contrib/django.pot'),
+                 out_file=os.path.join(ROOT, 'src/wolnelektury/locale-contrib/django.pot'),
                  name=None):
         self.app_dir = app_dir
         self.config = config
                  name=None):
         self.app_dir = app_dir
         self.config = config
@@ -123,12 +122,15 @@ class CustomLocale(Locale):
         for lc in zip(*languages)[0]:
             if os.path.exists(self.po_file(lc)):
                 copy_f(self.po_file(lc),
         for lc in zip(*languages)[0]:
             if os.path.exists(self.po_file(lc)):
                 copy_f(self.po_file(lc),
-                             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]:
             copy_f(os.path.join(input_directory, lc, self.name + '.po'),
 
     def load(self, input_directory, languages):
         for lc in zip(*languages)[0]:
             copy_f(os.path.join(input_directory, lc, self.name + '.po'),
-                         self.po_file(lc))
+                   self.po_file(lc))
+        self.compile()
+
+    def compile(self):
         os.system('pybabel compile -D django -d %s' % os.path.dirname(self.out_file))
 
 
         os.system('pybabel compile -D django -d %s' % os.path.dirname(self.out_file))
 
 
@@ -139,25 +141,42 @@ for appn in settings.INSTALLED_APPS:
     if is_our_app(app):
         try:
             SOURCES.append(AppLocale(app))
     if is_our_app(app):
         try:
             SOURCES.append(AppLocale(app))
-        except LookupError, e:
-            print "no locales in %s" % app.__name__
+        except LookupError as e:
+            print("no locales in %s" % app.__name__)
 
 SOURCES.append(ModelTranslation('infopages', 'infopages_db'))
 SOURCES.append(CustomLocale(os.path.dirname(allauth.__file__), name='contrib'))
 
 
 class Command(BaseCommand):
 
 SOURCES.append(ModelTranslation('infopages', 'infopages_db'))
 SOURCES.append(CustomLocale(os.path.dirname(allauth.__file__), name='contrib'))
 
 
 class Command(BaseCommand):
-    option_list = BaseCommand.option_list + (
-        make_option('-l', '--load', help='load locales back to source', action='store_true', dest='load', default=False),
-        make_option('-L', '--lang', help='load just one language', dest='lang', default=None),
-        make_option('-d', '--directory', help='load from this directory', dest='directory', default=None),
-        make_option('-o', '--outfile', help='Resulting zip file', dest='outfile', default='./wl-locale.zip'),
-        make_option('-m', '--merge', help='Use git to merge. Please use with clean working directory.', action='store_true', dest='merge', default=False),
-        make_option('-M', '--message', help='commit message', dest='message', default='New locale'),
-
-        )
     help = 'Make a locale pack'
     help = 'Make a locale pack'
-    args = ''
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+                '-l', '--load', help='load locales back to source',
+                action='store_true', dest='load', default=False)
+        parser.add_argument(
+                '-c', '--compile', help='compile messages',
+                action='store_true', dest='compile', default=False)
+        parser.add_argument(
+                '-g', '--generate', help='generate messages',
+                action='store_true', dest='generate', default=False)
+        parser.add_argument(
+                '-L', '--lang', help='load just one language',
+                dest='lang', default=None)
+        parser.add_argument(
+                '-d', '--directory', help='load from this directory',
+                dest='directory', default=None)
+        parser.add_argument(
+                '-o', '--outfile', help='Resulting zip file',
+                dest='outfile', default='./wl-locale.zip')
+        parser.add_argument(
+                '-m', '--merge', action='store_true',
+                dest='merge', default=False,
+                help='Use git to merge. Please use with clean working directory.')
+        parser.add_argument(
+                '-M', '--message', help='commit message',
+                dest='message', default='New locale')
 
     def current_rev(self):
         return os.popen('git rev-parse HEAD').read()
 
     def current_rev(self):
         return os.popen('git rev-parse HEAD').read()
@@ -192,32 +211,46 @@ class Command(BaseCommand):
             rf.write(rev)
             rf.close()
 
             rf.write(rev)
             rf.close()
 
-
             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)
             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))
+                # 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)
 
+    def generate(self):
+        for src in SOURCES:
+            src.generate(settings.LANGUAGES)
+
     def load(self, options):
         langs = get_languages(options['lang'])
 
         for src in SOURCES:
             src.load(options['directory'], langs)
 
     def load(self, options):
         langs = get_languages(options['lang'])
 
         for src in SOURCES:
             src.load(options['directory'], langs)
 
-    def handle(self, *a, **options):
+    def compile(self):
+        for src in SOURCES:
+            src.compile()
+
+    def handle(self, **options):
         if options['load']:
             if not options['directory'] or not os.path.exists(options['directory']):
         if options['load']:
             if not options['directory'] or not os.path.exists(options['directory']):
-                print "Directory not provided or does not exist, please use -d"
+                print("Directory not provided or does not exist, please use -d")
                 sys.exit(1)
 
                 sys.exit(1)
 
-            if options['merge']: self.merge_setup(options['directory'])
+            if options['merge']:
+                self.merge_setup(options['directory'])
             self.load(options)
             self.load(options)
-            if options['merge']: self.merge_finish(options['message'])
+            if options['merge']:
+                self.merge_finish(options['message'])
+        elif options['generate']:
+            self.generate()
+        elif options['compile']:
+            self.compile()
         else:
             self.save(options)
 
         else:
             self.save(options)