From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Thu, 29 Mar 2012 11:41:20 +0000 (+0200)
Subject: locale pack merge system
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/041af9eb76b4687798e75918976a738556621ff0?ds=sidebyside;hp=-c

locale pack merge system
---

041af9eb76b4687798e75918976a738556621ff0
diff --git a/apps/modeltranslation/management/commands/translation2po.py b/apps/modeltranslation/management/commands/translation2po.py
index c38d82c6c..57ef7fecf 100644
--- a/apps/modeltranslation/management/commands/translation2po.py
+++ b/apps/modeltranslation/management/commands/translation2po.py
@@ -41,6 +41,13 @@ def make_po(language=''):
     return po
 
 
+def get_languages(langs):
+    if not langs: return settings.LANGUAGES
+    langs = langs.split(',')
+    lm = dict(settings.LANGUAGES)
+    return map(lambda l: (l, lm.get(l, l)), langs)
+
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('-d', '--directory', help='Specify which directory should hold generated PO files', dest='directory'),
@@ -75,17 +82,11 @@ class Command(BaseCommand):
                     objects[md.__name__] = {}
                     modmod['model'] = md
 
-<<<<<<< Updated upstream
-            for lng in zip(*settings.LANGUAGES)[0]:
-                pofile = os.path.join(options['directory'], lng, appname + '.po')
-=======
             languages = get_languages(options['lang'])
 
             for lng in zip(*languages)[0]:
                 pofile = os.path.join(options['directory'], lng, options['poname'] + '.po')
                 if not os.path.exists(pofile): raise OSError('%s po file: %s not found' % (appname, pofile))
-                print pofile
->>>>>>> Stashed changes
                 po = polib.pofile(pofile)
                 for entry in po:
                     loc, pk = entry.occurrences[0]
diff --git a/apps/wolnelektury_core/management/commands/localepack.py b/apps/wolnelektury_core/management/commands/localepack.py
index 79bcdf4b7..147b51ceb 100644
--- a/apps/wolnelektury_core/management/commands/localepack.py
+++ b/apps/wolnelektury_core/management/commands/localepack.py
@@ -130,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')
@@ -150,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()
@@ -163,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:
@@ -174,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