X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ee8d5955079e5363a77c6d55577216392a219945..041af9eb76b4687798e75918976a738556621ff0:/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 0ccdb5da3..147b51ceb 100644
--- a/apps/wolnelektury_core/management/commands/localepack.py
+++ b/apps/wolnelektury_core/management/commands/localepack.py
@@ -50,8 +50,9 @@ class AppLocale(Locale):
 
     def load(self, input_directory, languages):
         for lc in zip(*languages)[0]:
-            shutil.copy2(os.path.join(input_directory, lc, self.name + '.po'),
-                         os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po'))
+            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'))
 
     def generate(self, languages):
         wd = os.getcwd()
@@ -65,14 +66,16 @@ class AppLocale(Locale):
 
 
 class ModelTranslation(Locale):
-    def __init__(self, appname):
+    def __init__(self, appname, poname=None):
         self.appname = appname
+        self.poname = poname and poname or appname
 
     def save(self, output_directory, languages):
-        call_command('translation2po', self.appname, directory=output_directory)
+        call_command('translation2po', self.appname, directory=output_directory, poname=self.poname)
 
     def load(self, input_directory, languages):
-        call_command('translation2po', self.appname, directory=input_directory, load=True, lang=','.join(zip(*languages)[0]))
+        call_command('translation2po', self.appname, directory=input_directory,
+                     load=True, lang=','.join(zip(*languages)[0]), poname=self.poname)
 
 
 class CustomLocale(Locale):
@@ -104,7 +107,7 @@ class CustomLocale(Locale):
         for lc in zip(*languages)[0]:
             shutil.copy2(os.path.join(input_directory, lc, self.name + '.po'),
                          self.po_file(lc))
-        os.system('pybabel compile -D django -d %s' % os.dirname(self.out_file))
+        os.system('pybabel compile -D django -d %s' % os.path.dirname(self.out_file))
 
 
 SOURCES = []
@@ -117,7 +120,7 @@ for appn in settings.INSTALLED_APPS:
         except LookupError, e:
             print "no locales in %s" % app.__name__
 
-SOURCES.append(ModelTranslation('infopages'))
+SOURCES.append(ModelTranslation('infopages', 'infopages_db'))
 SOURCES.append(CustomLocale(os.path.dirname(allauth.__file__), name='contrib'))
 
 
@@ -127,11 +130,19 @@ class Command(BaseCommand):
         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.', dest='merge', default=False),
+        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'
     args = ''
 
+    def current_rev(self):
+        return os.popen('git rev-parse HEAD').read()
+
+    def current_branch(self):
+        return os.popen("git branch |grep '^[*]' | cut -c 3-").read()
+
     def save(self, options):
         tmp_dir = tempfile.mkdtemp('-wl-locale')
         out_dir = os.path.join(tmp_dir, 'wl-locale')
@@ -147,7 +158,7 @@ class Command(BaseCommand):
                 #                src.save(settings.LANGUAGES)
 
             # write out revision
-            rev = os.popen('git rev-parse HEAD').read()
+            rev = self.current_rev()
             rf = open(os.path.join(out_dir, '.revision'), 'w')
             rf.write(rev)
             rf.close()
@@ -160,10 +171,6 @@ class Command(BaseCommand):
             shutil.rmtree(tmp_dir, ignore_errors=True)
 
     def load(self, options):
-        if not options['directory'] or not os.path.exists(options['directory']):
-            print "Directory not provided or does not exist, please use -d"
-            sys.exit(1)
-
         langs = get_languages(options['lang'])
 
         for src in SOURCES:
@@ -171,6 +178,33 @@ class Command(BaseCommand):
 
     def handle(self, *a, **options):
         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"
+                sys.exit(1)
+                
+            if options['merge']: self.merge_setup(options['directory'])
             self.load(options)
+            if options['merge']: self.merge_finish(options['message'])
         else:
             self.save(options)
+
+    merge_branch = 'wl-locale-merge'
+    last_branch = None
+    
+    def merge_setup(self, directory):
+        self.last_branch = self.current_branch()
+        rev = open(os.path.join(directory, '.revision')).read()
+
+        self.system('git checkout -b %s %s' % (self.merge_branch, rev))
+
+    def merge_finish(self, message):
+        self.system('git commit -a -m "%s"' % message.replace('"', '\\"'))
+        self.system('git checkout %s' % self.last_branch)
+        self.system('git merge -s recursive -X theirs %s' % self.merge_branch)
+        self.system('git branch -d %s' % self.merge_branch)
+
+    def system(self, fmt, *args):
+        code = os.system(fmt % args)
+        if code != 0:
+            raise OSError('Command %s returned with exit code %d' % (fmt % args, code))
+        return code