fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some cleaning.
[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
146cd31
..
bd63192
100644
(file)
--- a/
apps/wolnelektury_core/management/commands/localepack.py
+++ b/
apps/wolnelektury_core/management/commands/localepack.py
@@
-1,15
+1,17
@@
-
+# -*- 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.
+#
from optparse import make_option
from django.conf import settings
from django.core.management.base import BaseCommand
from django.core.management import call_command
from optparse import make_option
from django.conf import settings
from django.core.management.base import BaseCommand
from django.core.management import call_command
-from
modeltranslation.management.commands
.translation2po import get_languages
+from .translation2po import get_languages
import os
import shutil
import tempfile
import sys
import os
import shutil
import tempfile
import sys
-import zipfile
import allauth
import allauth
@@
-27,6
+29,11
@@
class Locale(object):
def generate(self, languages):
pass
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):
class AppLocale(Locale):
def __init__(self, appmod):
@@
-46,7
+53,7
@@
class AppLocale(Locale):
for lc in languages:
lc = lc[0]
if os.path.exists(os.path.join(self.path, 'locale', lc)):
for lc in languages:
lc = lc[0]
if os.path.exists(os.path.join(self.path, 'locale', lc)):
-
shutil.copy2
(os.path.join(self.path, 'locale', lc, 'LC_MESSAGES', 'django.po'),
+
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'))
@@
-56,7
+63,7
@@
class AppLocale(Locale):
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))
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))
-
shutil.copy2
(os.path.join(input_directory, lc, self.name + '.po'),
+
copy_f
(os.path.join(input_directory, lc, self.name + '.po'),
out)
wd = os.getcwd()
out)
wd = os.getcwd()
@@
-90,7
+97,7
@@
class ModelTranslation(Locale):
def load(self, input_directory, languages):
call_command('translation2po', self.appname, directory=input_directory,
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):
class CustomLocale(Locale):
@@
-115,12
+122,12
@@
class CustomLocale(Locale):
def save(self, output_directory, languages):
for lc in zip(*languages)[0]:
if os.path.exists(self.po_file(lc)):
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]:
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))
self.po_file(lc))
os.system('pybabel compile -D django -d %s' % os.path.dirname(self.out_file))
@@
-207,7
+214,7
@@
class Command(BaseCommand):
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 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'])
if options['merge']: self.merge_setup(options['directory'])
self.load(options)
if options['merge']: self.merge_finish(options['message'])
@@
-216,7
+223,7
@@
class Command(BaseCommand):
merge_branch = 'wl-locale-merge'
last_branch = None
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()
def merge_setup(self, directory):
self.last_branch = self.current_branch()
rev = open(os.path.join(directory, '.revision')).read()