limited stopwords + better search by author + remove descendant results

[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 5458904..76ea473 100644 (file)
--- a/src/wolnelektury/management/commands/localepack.py
+++ b/src/wolnelektury/management/commands/localepack.py
@@ -16,7 +16,7 @@ import sys
 
 import allauth
 
 
 import allauth
 

-ROOT = os.path.dirname(settings.PROJECT_DIR)
+ROOT = settings.ROOT_DIR

 
 
 def is_our_app(mod):
 
 
 def is_our_app(mod):


@@ -27,6 +27,9 @@ 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
 


@@ -63,11 +66,13 @@ class AppLocale(Locale):
                 out = os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po')
                 makedirs(os.path.dirname(out))
                 copy_f(os.path.join(input_directory, lc, self.name + '.po'), out)
                 out = os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po')
                 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:
         except:
             pass
         finally:


@@ -100,7 +105,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


@@ -126,6 +131,9 @@ class CustomLocale(Locale):
         for lc in zip(*languages)[0]:
             copy_f(os.path.join(input_directory, lc, self.name + '.po'),
                    self.po_file(lc))
         for lc in zip(*languages)[0]:
             copy_f(os.path.join(input_directory, lc, self.name + '.po'),
                    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))
 
 


@@ -147,6 +155,10 @@ 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),
     option_list = BaseCommand.option_list + (
         make_option('-l', '--load', help='load locales back to source', action='store_true', dest='load',
                     default=False),

+        make_option('-c', '--compile', help='compile messages', action='store_true', dest='compile',
+                    default=False),
+        make_option('-g', '--generate', help='generate messages', action='store_true', dest='generate',
+                    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('-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'),


@@ -201,12 +213,20 @@ class Command(BaseCommand):
         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 compile(self):
+        for src in SOURCES:
+            src.compile()
+

     def handle(self, *a, **options):
         if options['load']:
             if not options['directory'] or not os.path.exists(options['directory']):
     def handle(self, *a, **options):
         if options['load']:
             if not options['directory'] or not os.path.exists(options['directory']):


@@ -218,6 +238,10 @@ class Command(BaseCommand):
             self.load(options)
             if options['merge']:
                 self.merge_finish(options['message'])
             self.load(options)
             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)